Merge branch 'pn/commit-autosquash'