Upstream version 26.10.05+ds1