Merged Rajiv changes