Merge pull request #23414 from civicrm/5.50