Introduce latest changes of 1.6