Merge pull request #19903 from eileenmcnaughton/paypal