Update broker to new rfc version