Diff backports-3.25.0 with a backports-3.25.3

Thank you!