Merge pull request #22780 from civicrm/5.47