Upgrade Zinc 0.3.2-M1, close #1607