Merge branch 'hotfix/change_to_associations_foreign_keys'
Fixes has_one preservation across versions
Merge branch 'hotfix/has_one_loading' into develop