Merge pull request #21419 from civicrm/5.42