Fix DEVKIT-1233. For now renamed to Connection Management