Merge pull request #16420 from civicrm/5.22