Rework connection approach to better allow for reconnections #SGoo-35 comment