Committing after merge from nagaraju