Merge branch 'jc/rebase-i-commit-msg-fix'