merged to latest czmq