Ok, we can live with this in 26 branch, but we have to do something in upstream for upstream version, otherwise it get lost