Thank you all for the feedback. I'll re-evaluate my patch and resubmit it soon.
The problem clearly exists as I can easily reproduce it on my test setup, but the strategy to fix it needs some rework apparently. @Daniel maybe try tweaking your tests to use a smaller controller loss timeout (-l option)? I do this on my tests because the default value kicks in about 30min after hot-removal -- i.e. you have to actually wait for the timeout to expire to trigger the bug. Cheers, Enzo