LUN-670 -- comments