Merge branch 'en/rerere-multi-stage-1-fix' into maint