Upstream version 2025.09.17+ds