index on refactor: f270654 Remove superfluous disconnect implementation
WIP on refactor: f270654 Remove superfluous disconnect implementation
Swap files
Fixed integration tests.
Merge commit '1c17528' into refactor