Merging updates from Milind Branch