Merge commit '3f4fd99b1bc0dee254b62bf2fbcb81490a55796b' as 'src/rocksdb2'