TS-2865: Fix warnings in collapsed connection plugin