Merge branch 'jk/alloc-commit-id'