Merge branch 'sgen-stage-finalize'