Merge branch 'jk/alloc-commit-id-maint' into maint