Merge pull request #22735 from civicrm/5.47