Merge branch 'kh/commit'