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