Merge "Fix check style issues"