collapse empty attributes
merge collapse_optional_attributes
maintain interface compatibility across all adapters
Merge branch 'add_siren_subentity_rel'