Fixes has_one preservation across versions
Merge branch 'hotfix/has_one_loading'