Merge branch 'em/commit-claim'