Merge pull request #2008 from dlech/CustomAttributeData