Merge branch 'sg/stash-k-i'