Merge "Fixes random host disconnection after establishing connection" into klp-dev