Fix balancer to be more thread safe
Merge remote-tracking branch 'origin/maxima-survey' into maxima-survey