CLSN-1479 code review till 14th sep