Commit by chetan
Merge conflict fixed