FieldsExtension (with duplicates :( )
scope.fields is Map
duplicates fix
Merge remote-tracking branch 'remotes/origin/fieldsExtension' into develop