CLSN-981 : code review till 20th july