CLSN-1925 code review : from 26-Oct to 9-Nov : kapil