Merging updates from Mahesh branch