Merge "Fix deadlock between WMG and WMS" into sc-dev