Shortcut logic for new uncontended locks.
Merge remote-tracking branch 'remotes/origin/master' into repl