Merge branch 'B70-ZK-1807' of git://github.com/danchen0720/zk