Merge pull request #22984 from civicrm/5.48