Added self contained and ZK merge.