Merge pull request #23096 from eileenmcnaughton/ev_paid