Merging changes from Indev for 1.8.1 release