Milestone 1.6.0 #1