Merge "Remove deadlock/lock contention on Incremental progress update." into sc-dev