Merge pull request #15510 from civicrm/5.19