Merge Dhananjay's branch.