Merge branch 'has_one' into patches
Merge branch 'parent-child-commit-fix' into patches