Merging all updates from Milind branch