Merge branch 'tr/maint-doc-stash-pop' into maint