Temporary fix for MQTT client id length limit
Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge