CLSN-398 : stakeholder code review changes