Merge pull request #21505 from civicrm/5.42