Updated bundle. No ZeroMQ logging.
Fixed conflicts.