Merge branch 'jk/complete-commit-c'