Merge branch 'jc/commit-careful'