Updates from rabbitmq and tool chain teams