Merge pull request #14076 from annando/follow-vcard