CORE-421 modify custom attributes
Merge pull request #1938 from reciprocity/feature/mockup-custom-attr-update

CORE-421 modify custom attributes