Merge pull request #16028 from civicrm/5.20