Merge branch 'cb/maint-stash-orphaned-file' into maint