Td her has one

# Why?
Upstream there is a fix for serializing `has_one` relationships.

# What changed?
Merged in this fix and fixed merge conflicts.