Merge branch 'rs/commit-h-single-parent-cleanup'