Merging changes from Indev for 1.7.3 release