Import 1.6.4 part 1.