Merge pull request #866 from josacar/2-0-stable

Add skip_syntax_check feature again
Avoid updating lockfile switch