Merge pull request #20164 from mattwire/recaptcharegistrationbuildcustom