CLSN-1706 code review : 14 to 20 sep : kapil