Allow patching during src_prepare phase
Merge branch 'stage' into prime