Merge pull request #382 from telefonicaid/hardening/xml_tags_in_associations

Hardening/xml tags in associations
Merge branch 'develop' into hardening/compiler_to_concatenate