Merge branch 'ps/stash-in-c'