Missing changes from 3.10