Merge pull request #17432 from mattwire/repeattransactionpendingdefault