Merge pull request #21612 from civicrm/5.42