copy/paste code into new branch made from develop
Merge pull request #1837 from reciprocity/feature/custom-attributes-merge-fix

copy/paste code into new branch made from develop