Merge branch 'js/maint-stash-index-copy' into maint