diff --git a/HISTORY.md b/HISTORY.md
index 6a7026d9a25..199824ce806 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,8 @@
 # Unreleased
 ### Public API Change
 * Deprecate BlockBaseTableOptions.hash_index_allow_collision=false
+* options.memtable_prefix_bloom_bits changes to options.memtable_prefix_bloom_bits_ratio and deprecate options.memtable_prefix_bloom_probes
+* enum type #movebot Rocksdb Users Group and PerfLevel changes from char to unsigned char. Value of all PerfLevel shift by one.
 
 
 # Rocksdb Change Log
diff --git a/include/rocksdb/listener.h b/include/rocksdb/listener.h
index 32f012b7729..fde0db592df 100644
--- a/include/rocksdb/listener.h
+++ b/include/rocksdb/listener.h
@@ -20,7 +20,7 @@ typedef std::unordered_map<std::string, std::shared_ptr<const TableProperties>>
 class DB;
 class Status;
 struct CompactionJobStats;
-enum CompressionType : char;
+enum CompressionType : unsigned char;
 
 enum class TableFileCreationReason {
   kFlush,
diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h
index c7afd1a8434..d9b830b6dd6 100644
--- a/include/rocksdb/options.h
+++ b/include/rocksdb/options.h
@@ -52,7 +52,7 @@ class WalFilter;
 // sequence of key,value pairs.  Each block may be compressed before
 // being stored in a file.  The following enum describes which
 // compression method (if any) is used to compress a block.
-enum CompressionType : char {
+enum CompressionType : unsigned char {
   // NOTE: do not change the values of existing entries, as these are
   // part of the persistent format on disk.
   kNoCompression = 0x0,
@@ -66,7 +66,7 @@ enum CompressionType : char {
   kZSTDNotFinalCompression = 0x40,
 
   // kDisableCompressionOption is used to disable some compression options.
-  kDisableCompressionOption = -1,
+  kDisableCompressionOption = 0xff,
 };
 
 enum CompactionStyle : char {
diff --git a/include/rocksdb/perf_level.h b/include/rocksdb/perf_level.h
index b36529b3330..5fddac57c26 100644
--- a/include/rocksdb/perf_level.h
+++ b/include/rocksdb/perf_level.h
@@ -13,14 +13,14 @@ namespace rocksdb {
 
 // How much perf stats to collect. Affects perf_context and iostats_context.
 
-enum PerfLevel : char {
-  kUninitialized = -1,            // unknown setting
-  kDisable = 0,                   // disable perf stats
-  kEnableCount = 1,               // enable only count stats
-  kEnableTimeExceptForMutex = 2,  // Other than count stats, also enable time
+enum PerfLevel : unsigned char {
+  kUninitialized = 0,             // unknown setting
+  kDisable = 1,                   // disable perf stats
+  kEnableCount = 2,               // enable only count stats
+  kEnableTimeExceptForMutex = 3,  // Other than count stats, also enable time
                                   // stats except for mutexes
-  kEnableTime = 3,                // enable count and time stats
-  kOutOfBounds = 4                // N.B. Must always be the last value!
+  kEnableTime = 4,                // enable count and time stats
+  kOutOfBounds = 5                // N.B. Must always be the last value!
 };
 
 // set the perf stats level for current thread
diff --git a/include/rocksdb/utilities/leveldb_options.h b/include/rocksdb/utilities/leveldb_options.h
index ea5063459c0..d17bcb0d0de 100644
--- a/include/rocksdb/utilities/leveldb_options.h
+++ b/include/rocksdb/utilities/leveldb_options.h
@@ -21,7 +21,7 @@ class Logger;
 struct Options;
 class Snapshot;
 
-enum CompressionType : char;
+enum CompressionType : unsigned char;
 
 // Options to control the behavior of a database (passed to
 // DB::Open). A LevelDBOptions object can be initialized as though