Merge branch 'hotfix/fix_decorator'
fixed conflicts
Fixed null behavior in fk
Merge branch 'hotfix/fix_foreign_key_serializer' into develop