I'm heading to bed, but @happy-kitchen-89482 if you revert 33674cedc it should fix the issue at the expense of re-inserting a race condition, otherwise I should be able to fix Tuesday London time