Merge pull request #15529 from civicrm/5.19