LUN-1070 -- more comments