Import 4.7 changes