Merge branch 'jm/stash-diff-disambiguate'