Merge branch of B65-ZK-2035 of https://github.com/danchen0720/zk.git