Gate zmq

Fix for #16088