Merge branch 'pw/completion-stash' into maint