Merge branch B70-ZK-2095 of https://github.com/danchen0720/zk.git