Thank you for looking into this, much appreciated.
Yes, I can confirm that the patch fixes both the busy-loop and client<->server desynchronization problem for me.