Merge pull request #22584 from civicrm/5.46