Merge "Fix contrast exception"