Changes for 7.x-1.6 release