Upgrade Zinc 0.3.2-M3, close #1803