Squashed the patches.

Thanks,
Amar