Merge commit of '9eb82a5d6e365cfff756b215367e8a928fdd9f38' as 'src/rocksdb2'