Merge pull request #20165 from mattwire/recaptchasignaturebuildcustom