Merge "Remove WITH_SYNTAX_CHECK"