[stitcher] Improve (Closes #7162, closes #7228)