CLSN-985 code review til 20th july