Merge changes from last few days.