Integrated fix by Prabhu.
Integrated fix by Prabhu.

zhangfangyan/devide,chrisidefix/devide,fvpolpeta/devide,zhangfangyan/devide,ivoflipse/devide,chrisidefix/devide,nagyistoce/devide,fvpolpeta/devide,nagyistoce/devide,ivoflipse/devide