Merge pull request #16194 from civicrm/5.22