diff --git a/ci/check_self_test_names.py b/ci/check_self_test_names.py
index 18943e918dd1a2a17370c41254a90166dc1852d1..3dea1a1200301d6cfd89c07f4811a901134dd627 100644
--- a/ci/check_self_test_names.py
+++ b/ci/check_self_test_names.py
@@ -45,7 +45,7 @@ if __name__ == "__main__":
             if skiplines > 0:
                 skiplines = skiplines - 1
             else:
-                if "//" in line and len(line) > args.max_length:
+                if "//" in line and all(x not in line for x in ["IVAS_cod", "IVAS_dec", "IVAS_rend"]) and len(line) > args.max_length:
                     exceeded.append(line)
 
     if exceeded:
diff --git a/lib_com/options.h b/lib_com/options.h
index efe7b79a0bdd4c4597f797afd704a09af122c66b..89f4b7e0962ebf53145a13dc572dcd5fc2da65fa 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -169,6 +169,7 @@
 #define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */
 #define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES     /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */
 #define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */
+#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c
index 8ed19f9de0d572e68721b0f3c1b9211a8b543813..e2000d57493f663c4ae92c4b58e718b455a0db39 100644
--- a/lib_dec/core_dec_init.c
+++ b/lib_dec/core_dec_init.c
@@ -150,7 +150,11 @@ void open_decoder_LPD(
     {
         st->gamma = GAMMA16k;
     }
+#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP
+    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )
+#else
     else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )
+#endif
     {
         st->gamma = GAMMA16k;
     }