Merged changes from Manish