Merging changes from Indev for 1.7.2 release