Merge branch 'feature/pluggable-broker'