Merge branch 'hotfix/fix_foreign_key_serializer'
Merge branch 'hotfix/fix_fk_serialization' into develop