support_snark branch is merged into master