Merge pull request #17243 from civicrm/5.25