Merge pull request #38063 from barredterra/remove-create-contact