Merge "Fix comments and color format"