Feature/merge local changes

This is the local changes from our Rabbitmq code.