Merge branch '3829_syntax_case_insense'