Merge "Unification of broker concepts implementations"