Merge IGNORE_STYLE change and my change.