CLC-3966 Add comments from code review