Merge from rohit

Merging to a specially created branch.