mqtt: compatibility for latest master