Bringing mainline changes by Megh