Merging changes from Indev for 1.7.1 release