Code refinement.
Merge branch 'support_ignorecase'