Support skip_syntax_check in master