Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7' * commit 'df60830a42580af976b0fc88784d1d32191bd1d7': Must hold lock here...
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7' * commit 'df60830a42580af976b0fc88784d1d32191bd1d7': Must hold lock here...