CLSN-1270 Code review Done