Prevent updater race conditions.
Merge Zixaphir X