Release v1.25.2

This release contains various fixes for refactoring issues from v1.25.0 and v1.25.1

Changelog