AttributeController done

Merged M2113 requested to merge finish-attributeController into development

Merge request reports