Merge pull request #22460 from civicrm/5.46