Merge pull request #23685 from DougGregor/custom-attributes-parse