Merge branch 'tg/deprecate-stash-save'