Adding changes of 1.10.x