SM: make "connect on finish" configurable