Merge pull request #15186 from seamuslee001/member_fields_xml_change