diff --git a/apps/encoder.c b/apps/encoder.c
index 21aa5d0b1d489552451f01b734accc94497f1e18..9143b0eb9e2a7e754cd610a50f7f10ff536daf6f 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -368,6 +368,15 @@ int main(
         goto cleanup;
     }
 
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#ifdef DEBUGGING
+    if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )
+    {
+        fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );
+    }
+#endif
+#endif
+
     /*------------------------------------------------------------------------------------------*
      * Configure and initialize (allocate memory for static variables) the encoder
      *------------------------------------------------------------------------------------------*/
@@ -1056,7 +1065,24 @@ static bool parseCmdlIVAS_enc(
             }
             else
             {
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+                if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )
+                {
+                    strcpy( stmp, "TCX10" );
+                }
+                else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )
+                {
+                    strcpy( stmp, "TCX20" );
+                }
+                else
+                {
+                    strncpy( stmp, argv[i + 1], sizeof( stmp ) );
+                }
+
+                fprintf( stdout, "Forcing codec to:       %s\n", stmp );
+#else
                 fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );
+#endif
             }
 
             i += 2;
@@ -2033,10 +2059,24 @@ static IVAS_ENC_FORCED_MODE parseForcedMode(
     {
         return IVAS_ENC_FORCE_GSC;
     }
-    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )
+    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) 
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )
+#endif
+        )
     {
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        return IVAS_ENC_FORCE_TCX20;
+#else
         return IVAS_ENC_FORCE_TCX;
+#endif
     }
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )
+    {
+        return IVAS_ENC_FORCE_TCX10;
+    }
+#endif
     if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )
     {
         return IVAS_ENC_FORCE_HQ;
diff --git a/lib_com/cnst.h b/lib_com/cnst.h
index 40f8437895e69633a5c5563a5b6eb3b186fac3c4..556da0d14196131be5b7eb2fb21dde24c2a7236d 100644
--- a/lib_com/cnst.h
+++ b/lib_com/cnst.h
@@ -81,8 +81,14 @@
 #define FORCE_MUSIC                     101             /* debugging - force music on the command line */
 #define FORCE_ACELP                     102             /* debugging - force ACELP core on the command line */
 #define FORCE_GSC                       103             /* debugging - force GSC core on the command line */
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#define FORCE_TCX10                     104             /* debugging - force TCX10 core on the command line */
+#define FORCE_TCX20                     105             /* debugging - force TCX20 core on the command line */
+#define FORCE_HQ                        106             /* debugging - force HQ core on the command line */
+#else
 #define FORCE_TCX                       104             /* debugging - force TCX core on the command line */
 #define FORCE_HQ                        105             /* debugging - force HQ core on the command line */
+#endif
 #define FORCE_TD_RENDERER               201
 #define FORCE_CLDFB_RENDERER            202
 #endif
diff --git a/lib_com/options.h b/lib_com/options.h
index ee78db378b7511b2b592122744273619549e2457..a23a28b65f89760d06d15cc49484c5121c883b80 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -57,10 +57,8 @@
 /*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */
 
 #ifdef DEBUGGING
-
 #define DISABLE_DFT_STEREO_ASSERT               /* This assert is hit for -10 dB tests/codec_be_on_mr_nonselection/test_param_file.py::test_param_file_tests[stv-stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, bandwidth switching] */
 
-
 /*#define DEBUG_MODE_INFO*/                         /* output most important parameters to the subdirectory "res/" */
 #ifdef DEBUG_MODE_INFO
 /*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */
@@ -76,6 +74,7 @@
 /*#define DEBUG_MODE_INFO_ALLRAD*/              /* define to output generated HOA decoding mtx */
 /*#define DEBUG_MODE_LFE */                     /* define to output LFE relevant parameters */
 #endif
+#define SUPPORT_FORCE_TCX10_TCX20              /* VA: Enable -force tcx10|tcx20 command-line option */
 
 #ifdef DEBUG_MODE_MDCT
 #define DEBUG_PLOT_BITS
diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc.c
index 6e4c4978b6ad81dece3ed0d435a1711d15708623..084efb6a500dc34b714dc678d82e4ffb19ade741 100644
--- a/lib_enc/ivas_decision_matrix_enc.c
+++ b/lib_enc/ivas_decision_matrix_enc.c
@@ -200,10 +200,17 @@ void ivas_decision_matrix_enc(
         {
             st->core = ACELP_CORE;
         }
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        else if ( st->force == FORCE_TCX20 || st->force == FORCE_TCX10 ) /* Initalizations should always happen with TCX20*/
+        {
+            st->core = TCX_20_CORE;
+        }
+#else
         else if ( st->force == FORCE_TCX )
         {
             st->core = TCX_20_CORE;
         }
+#endif
         else if ( st->force == FORCE_HQ && st->element_mode != IVAS_CPE_MDCT && element_brate >= IVAS_24k4 )
         {
             st->core = HQ_CORE;
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index a308be9bb62960e2a51def08300a55082f13fd13..0fb8eabb35b33afae2b250b7e9673fa3cf4e4e03 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -2325,9 +2325,18 @@ static ivas_error forcedModeApiToInternal(
         case IVAS_ENC_FORCE_GSC:
             *forcedModeInternal = FORCE_GSC;
             break;
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+        case IVAS_ENC_FORCE_TCX10:
+            *forcedModeInternal = FORCE_TCX10;
+            break;
+        case IVAS_ENC_FORCE_TCX20:
+            *forcedModeInternal = FORCE_TCX20;
+            break;
+#else
         case IVAS_ENC_FORCE_TCX:
             *forcedModeInternal = FORCE_TCX;
             break;
+#endif
         case IVAS_ENC_FORCE_HQ:
             *forcedModeInternal = FORCE_HQ;
             break;
diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h
index 13399ba0ca21377e48734c52990e72f60ac018d7..52c05332aea2b6a1831ef60c8b2fe315321ab443 100644
--- a/lib_enc/lib_enc.h
+++ b/lib_enc/lib_enc.h
@@ -127,7 +127,12 @@ typedef enum _IVAS_ENC_FORCED_MODE
     IVAS_ENC_FORCE_MUSIC,
     IVAS_ENC_FORCE_ACELP,
     IVAS_ENC_FORCE_GSC,
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+    IVAS_ENC_FORCE_TCX10,
+    IVAS_ENC_FORCE_TCX20,
+#else
     IVAS_ENC_FORCE_TCX,
+#endif
     IVAS_ENC_FORCE_HQ,
     IVAS_ENC_FORCE_UNFORCED,
     IVAS_ENC_FORCE_UNDEFINED = 0xffff
diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c
index 04cf8ea2471a095aede392c3f01641dce49b3c15..15273d26cc5a4258fbd393872fffa055582d799a 100644
--- a/lib_enc/transient_detection.c
+++ b/lib_enc/transient_detection.c
@@ -324,6 +324,20 @@ void SetTCXModeInfo(
                 hTcxEnc->tcxMode = NO_TCX;
             }
         }
+
+#ifdef SUPPORT_FORCE_TCX10_TCX20
+#ifdef DEBUGGING
+        if ( st->force == FORCE_TCX10 )
+        {
+            hTcxEnc->tcxMode = TCX_10;
+        }
+        else if ( st->force == FORCE_TCX20 )
+        {
+            hTcxEnc->tcxMode = TCX_20;
+        }
+#endif
+#endif
+
         /* set the left window overlap */
         if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE )
         {