Pushing fixes done by Abhijeet,DJ,Sindhu,Kumar