Merge branch 'jc/commit'