Fix comments from CR. TENMARKS-4933