Merge pull request #39748 from blaggacao/fix/pe-fill-in-contact-fields