Merge pull request #17526 from mattwire/frontendrequiredpaymentfrequency