Merge branch 'js/stash-p-fix'