Merge "Fixing a condition that can cause deadlock" into sc-dev