Merge pull request #22222 from civicrm/5.45