v6.26 changes.