Merge changes from `2.25.2` release (#3936)

14 files changed