Merge branch 'vv/merge-squash-with-explicit-commit'