Removed disabled timeout-skip feature. Direct lock acquisition can be used instead.
Merge remote-tracking branch 'remotes/origin/master' into repl