Merge pull request #21736 from civicrm/5.42