Upgrade Zinc 0.3.5, close #1920