messaging model changes and MQTT updates
updates
revert the code formatting
revert the code formatting
revert the code formatting