Merge pull request #22582 from civicrm/5.46