More updates to 3.25
4 files changed