Merge pull request #23100 from civicrm/5.48