Merge "Clean up and fix bugs in ConnectionService.createConnection" into lmp-dev