Changes to reduce the gap between peers and the broker

**Description:** changes to reduce the gap between peers and the broker.
**Testing:** tests pass
**Coverage:** under measurement