First commit for 1.7