Merge pull request #23196 from civicrm/5.49