Revert "Revert "zkq2""

This reverts commit c27ef97c810e7e8ab856f9e7da4e4d4205fa7d1d.