Merge back maintenance updates made by Ashish Patil