Merge branch 'dev' into tableLevels

diff --cc lib/compress/zstd_compress.c
index faecad40fd7053bd5dbfca240d484d8d1bf5e800,d4191afa1eb7223334a6b4665a33648eba47dbc8..d8420a8a65a1de731767bfc119cf3934ec3f2f8f
--- 1/lib/compress/zstd_compress.c
--- 2/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@@ -3515,11 -3527,11 +3527,11 @@@ static const ZSTD_compressionParameter
      { 14, 15, 15,  6,  3, 64, ZSTD_btopt   },  /* level 15.*/
      { 14, 15, 15,  6,  3, 96, ZSTD_btopt   },  /* level 16.*/
      { 14, 15, 15,  6,  3,128, ZSTD_btopt   },  /* level 17.*/
-     { 14, 15, 15,  7,  3,256, ZSTD_btopt   },  /* level 18.*/
 -    { 14, 15, 15,  6,  3,256, ZSTD_btopt   },  /* level 18.*/
 -    { 14, 15, 15,  7,  3,256, ZSTD_btopt   },  /* level 19.*/
++    { 14, 15, 15,  8,  3,256, ZSTD_btopt   },  /* level 18.*/
 +    { 14, 15, 15,  6,  3,256, ZSTD_btultra },  /* level 19.*/
      { 14, 15, 15,  8,  3,256, ZSTD_btultra },  /* level 20.*/
      { 14, 15, 15,  9,  3,256, ZSTD_btultra },  /* level 21.*/
-     { 14, 15, 15, 10,  3,256, ZSTD_btultra },  /* level 22.*/
+     { 14, 15, 15, 10,  3,512, ZSTD_btultra },  /* level 22.*/
  },
  };