Next set
Merge remote-tracking branch 'origin/WorkplaceJoin' into WorkplaceJoin
Clean up and cancel connection  on stop.
Merge remote-tracking branch 'origin/WorkplaceJoin' into WorkplaceJoin
Some local updates
Latest attempt