Merge "Fix color mismatch of pointers"