Merging changes from Indev for 1.6.1 release