CLSN-64 code review - Jun 30