Merge "Fix deadlock between WMGlobal and WMS" into main