Merge pull request #17092 from civicrm/5.25