Master-side source steps support patches. Fixes #2098
Merge branch 'bug2098-squash' into bug2098