Added first two commits from peacekeeper_unni