Changes for 1.7 release