Needs to be more robust in reconnection scenarios

[freol35241]

Have needed manual restarts every now and then....

[freol35241]

Should be fixed by 8367448. Keeping this open until confirmed.

[freol35241]

Still problematic, fails with reference to invalid ClientID on reconnection attempts, why?