Merge pull request #23028 from civicrm/5.48