Merge pull request #23326 from civicrm/5.49