Merge pull request #22945 from civicrm/5.48