Merge pull request #12312 from colemanw/multiRecordCustomProfile