Import 1.6.4 part 5. Finally done.