Merge pull request #15351 from civicrm/5.18