Merge pull request #15526 from civicrm/5.19