Scrub lock contention

Create a clean diff by merging all the patches generated around the discussion.