Setting null to null isn't that useful
Merge branch 'set-id-on-parent-refs' into stage