Added more commits from peacekeeper_unni