Upstream version 5.25.0