Merge branch 'tg/demote-stash-save-in-completion'