CLSN-1269 code review issues - till 17 aug - kapil