Master-side source steps support patches. Fixes #2098