Sush | #2105 | moving the connection logic out of the static block