diff --git a/lib_com/ivas_pca_tools_fx.c b/lib_com/ivas_pca_tools_fx.c
index 3b94a85fbb5741a91991f42ab4227789e17c764c..a265a149636fa5e92d0897493f23c873eec0873e 100644
--- a/lib_com/ivas_pca_tools_fx.c
+++ b/lib_com/ivas_pca_tools_fx.c
@@ -1375,7 +1375,11 @@ void pca_enc_s3_fx(
 
     q_ang_2surv_fx( ph1_fx, n1, ph1_q_fx, ind1 );
 
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    tmp = mac_r( L_mac( L_mult( q_fx[1], q_fx[1] ), q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ); // Q15 + Q15 - Q15 -> Q15
+#else
     tmp = add( add( mult( q_fx[1], q_fx[1] ), mult( q_fx[2], q_fx[2] ) ), mult( q_fx[3], q_fx[3] ) ); // Q15 + Q15 - Q15 -> Q15
+#endif
     r_e = 0;
     move16();
     r_fx = Sqrt16( tmp, &r_e );
@@ -1429,8 +1433,11 @@ void pca_enc_s3_fx(
         q_ang_2surv_fx( ph2_fx, n2[i], ph2_q_fx + 2 * i, ind2 + 2 * i );
     }
 
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    r_fx = Sqrt16( mac_r( L_mult( q_fx[2], q_fx[2] ), q_fx[3], q_fx[3] ), &r_e );
+#else
     r_fx = Sqrt16( add( mult( q_fx[2], q_fx[2] ), mult( q_fx[3], q_fx[3] ) ), &r_e );
-
+#endif
 
     v_fx = BASOP_Util_Divide1616_Scale( q_fx[2], r_fx, &v_e );
     v_e = add( v_e, sub( 0, r_e ) );
diff --git a/lib_com/options.h b/lib_com/options.h
index 64f0ce3aa63dd252d1d008136679ef8e5a2cbb95..52ae37685e24a3cd62161254e6010b8b5613fd37 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -88,6 +88,7 @@
 #define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */
 #define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */
 #define FIX_2248_EVS_ASSERT                             /* VA: Include _sat in an EVS related part of the code */
+#define FIX_2254_IMPROV_COMPLEXITY_BE                   /* VA: BE small complexity reduction  */
 
 /* #################### End BE switches ################################## */
 
@@ -99,6 +100,7 @@
 #define FIX_2041_SPECTRAL_GAPS_FOR_INACTIVE_FRAMES      /* FhG: Using rounding in multiplication to improve precision in cngNoiseLevel[] */
 #define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC   /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/
 #define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */
+#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE  /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */
 
 /* ##################### End NON-BE switches ########################### */
 
@@ -117,4 +119,5 @@
 
 /* #################### End BASOP optimization switches ############################ */
 
+
 #endif
diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c
index cc7e544e896b9b7487ac1e7c6dbcd3fdf1079d3e..591eab841154b0b58b1235137d15a53e96409374 100644
--- a/lib_com/pred_lt4_fx.c
+++ b/lib_com/pred_lt4_fx.c
@@ -58,9 +58,13 @@ void pred_lt4_ivas_fx(
             FOR( i = 0; i < nb_coef; i++ )
             {
                 /*s += (*x1--) * (*c1) + (*x2++) * (*c2);*/
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+                s64 = W_mac_32_16( s64, ( *c1 ), *x1-- ); /* Q_exc + Q32 */
+                s64 = W_mac_32_16( s64, ( *c2 ), *x2++ ); /* Q_exc + Q32 */
+#else
                 s64 = W_mac_32_32( s64, L_deposit_l( *x1-- ), ( *c1 ) ); /* Q_exc + Q32 */
                 s64 = W_mac_32_32( s64, L_deposit_l( *x2++ ), ( *c2 ) ); /* Q_exc + Q32 */
-
+#endif
                 c1 += up_sample;
                 c2 += up_sample;
             }
diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c
index 2fb37132f61825efa05bfac97b3e57e2a0080dbc..29672d3e0db3bd71b28c6515249fca15b37434c9 100644
--- a/lib_dec/bass_psfilter_fx.c
+++ b/lib_dec/bass_psfilter_fx.c
@@ -1041,7 +1041,11 @@ Word16 res_bpf_adapt_ivas_fx(
         bpf_error_ratio = ONE_IN_Q14; // Q13
         move16();
     }
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    bpf_error_ratio = mac_r( L_mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx );
+#else
     bpf_error_ratio = add( mult( STEREO_DFT_BPF_ADAPT_BETA_FX, bpf_error_ratio ), mult( ( MAX_16 - STEREO_DFT_BPF_ADAPT_BETA_FX ), hStereoDft->bpf_error_ratio_mem_fx ) );
+#endif
     hStereoDft->bpf_error_ratio_mem_fx = bpf_error_ratio;
     move16();
 
diff --git a/lib_dec/ivas_sns_dec_fx.c b/lib_dec/ivas_sns_dec_fx.c
index 0425cb7ac3196ab29e2129de09d67a9573dd42ab..2f0217b48ad7cbc167a7d35cd5999e7218685644 100644
--- a/lib_dec/ivas_sns_dec_fx.c
+++ b/lib_dec/ivas_sns_dec_fx.c
@@ -81,7 +81,11 @@ static void sns_1st_dec_fx(
 
     FOR( i = 0; i < M / 2; i++ )
     {
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+        snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); // Q16
+#else
         snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); // Q16
+#endif
         move32();
     }
 
@@ -89,7 +93,11 @@ static void sns_1st_dec_fx(
 
     FOR( i = M / 2; i < M; i++ )
     {
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+        snsq_fx[i] = L_mac( L_mult( ( *p_dico++ ), cdbk_fix ), means[i], means_fix ); /*Q16*/
+#else
         snsq_fx[i] = L_add( L_mult( ( *p_dico++ ), cdbk_fix ), L_mult( means[i], means_fix ) ); /*Q16*/
+#endif
         move32();
     }
 
diff --git a/lib_dec/ivas_stereo_cng_dec_fx.c b/lib_dec/ivas_stereo_cng_dec_fx.c
index 2a652a573a35955595dde411016a5fb48bac7998..d08b38852953f2d5dc6122556bd17b469c296921 100644
--- a/lib_dec/ivas_stereo_cng_dec_fx.c
+++ b/lib_dec/ivas_stereo_cng_dec_fx.c
@@ -119,11 +119,14 @@ static void stereo_dft_generate_comfort_noise_fx(
     Word32 tmp32_1, tmp32_2;
     Word16 q_div, q_sqrt1, q_sqrt2, q_sqrt, sqrt_res;
     Word16 q_shift, q_shift_1, q_shift_2, min_q;
-
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    Word16 tmp16, tmp_p, tmp_s;
+#endif
     hFdCngCom = st->hFdCngDec->hFdCngCom;
 
     push_wmops( "DFT_CNG" );
 
+
     set16_fx( dmpf, 0, M + 2 );
     set16_fx( Atmp, 0, M + 2 );
 
@@ -161,7 +164,11 @@ static void stereo_dft_generate_comfort_noise_fx(
             }
             ELSE
             {
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                hStereoDft->g_state_fx[b] = mac_r( L_mult( ONE_MINUS_A_GFILT_FX, extract_h( *pSideGain++ ) ), A_GFILT_FX, hStereoDft->g_state_fx[b] ); /* Q15 */
+#else
                 hStereoDft->g_state_fx[b] = add( mult( ONE_MINUS_A_GFILT_FX, extract_h( *pSideGain++ ) ), mult( A_GFILT_FX, hStereoDft->g_state_fx[b] ) ); /* Q15 */
+#endif
                 move16();
             }
 
@@ -188,13 +195,21 @@ static void stereo_dft_generate_comfort_noise_fx(
                 }
                 ELSE
                 {
-                    hStereoCng->cm_fx[b] = add( mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), mult( A_GFILT_FX, hStereoCng->cm_fx[b] ) ); /* Q15 */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                    hStereoCng->cm_fx[b] = mac_r( L_mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), A_GFILT_FX, hStereoCng->cm_fx[b] ); /* Q15 */
+#else
+                    hStereoCng->cm_fx[b] = add( mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), mult( A_GFILT_FX, hStereoCng->cm_fx[b] ) );           /* Q15 */
+#endif
                     move16();
                 }
             }
             ELSE
             {
-                hStereoCng->cm_fx[b] = add( mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), mult( A_GFILT_FX, hStereoCng->cm_fx[b] ) ); /* Q15 */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                hStereoCng->cm_fx[b] = mac_r( L_mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), A_GFILT_FX, hStereoCng->cm_fx[b] ); /* Q15 */
+#else
+                hStereoCng->cm_fx[b] = add( mult( ONE_MINUS_A_GFILT_FX, hStereoCng->coh_fx[b] ), mult( A_GFILT_FX, hStereoCng->cm_fx[b] ) );               /* Q15 */
+#endif
                 move16();
             }
         }
@@ -226,6 +241,17 @@ static void stereo_dft_generate_comfort_noise_fx(
                 }
 
                 LR_ratio = extract_h( tdm_ratio_tabl_fx[hStereoCng->last_tdm_idx] ); /* Q15 */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                tmp16 = shr( hStereoDft->g_state_fx[b], 2 );
+                tmp_p = add( ONE_IN_Q13, tmp16 );
+                tmp_s = sub( ONE_IN_Q13, tmp16 );
+                tmp16 = mult( gamma, 2048 );
+
+                c = BASOP_Util_Divide3232_Scale(
+                    L_mac( L_mult( tmp_p, tmp_p ), gamma, tmp16 ),
+                    L_mac( L_mult( tmp_s, tmp_s ), gamma, tmp16 ),
+                    &c_e );
+#else
                 c = BASOP_Util_Divide3232_Scale(
                     L_add( L_mult( add( ONE_IN_Q13, shr( hStereoDft->g_state_fx[b], 2 ) ),
                                    add( ONE_IN_Q13, shr( hStereoDft->g_state_fx[b], 2 ) ) ),
@@ -234,6 +260,7 @@ static void stereo_dft_generate_comfort_noise_fx(
                                    sub( ONE_IN_Q13, shr( hStereoDft->g_state_fx[b], 2 ) ) ),
                            L_shr( L_mult( gamma, gamma ), 4 ) ),
                     &c_e );
+#endif
                 q_sqrt = c_e;
                 move16();
                 sqrt_res = Sqrt16( mult( c, hStereoCng->cm_fx[b] ), &q_sqrt );
diff --git a/lib_dec/ivas_stereo_dft_dec_fx.c b/lib_dec/ivas_stereo_dft_dec_fx.c
index 4cd4ef8c6b97aaf80a9a1b9eeeddc2aaed462fed..72527526a06700f007393df396a8c248fd2e1bb6 100644
--- a/lib_dec/ivas_stereo_dft_dec_fx.c
+++ b/lib_dec/ivas_stereo_dft_dec_fx.c
@@ -3719,8 +3719,11 @@ void stereo_dft_dec_sid_coh_fx(
             pred_fx = add( pred_fx, shl( mult( ( *pptr_fx++ ), cohBandq_fx[i] ), 2 ) ); /*q-13*/
         }
         /* Weighted intra/inter-frame prediction */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+        pred_fx = mac_r( L_mult( alpha_fx, pred_fx ), sub( 32767, alpha_fx ), shr( coh_fx[b], 2 ) ); /*q-13*/
+#else
         pred_fx = add( mult( alpha_fx, pred_fx ), mult( sub( 32767, alpha_fx ), shr( coh_fx[b], 2 ) ) ); /*q-13*/
-
+#endif
         /* Read residual index from bitstream */
         IF( LT_16( *nb_bits, nr_of_sid_stereo_bits ) ) /* If the bit limit is reached, res_index = 0 is assumed for remaining indices */
         {
diff --git a/lib_dec/ivas_stereo_ica_dec_fx.c b/lib_dec/ivas_stereo_ica_dec_fx.c
index 069f42bca2f078cee81a432d8aabfc43ca68bebd..b6bdb559b33b23b4e13fa4ddd440de7ee0de1f69 100644
--- a/lib_dec/ivas_stereo_ica_dec_fx.c
+++ b/lib_dec/ivas_stereo_ica_dec_fx.c
@@ -193,7 +193,11 @@ void stereo_tca_dec_fx(
 
         IF( currentNCShift != 0 )
         {
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+            currentNCShift = mac_r( L_mult( 19660 /* 0.6 in Q15 */, prevNCShift ), 13106 /* 0.4 in Q15 */, currentNCShift ); /* Q0 */
+#else
             currentNCShift = add( mult( 19660 /* 0.6 in Q15 */, prevNCShift ), mult( 13106 /* 0.4 in Q15 */, currentNCShift ) ); /* Q0 */
+#endif
         }
 
         prevNCShift = hStereoTCA->interp_dec_prevNCShift; /* Q0 */
diff --git a/lib_enc/ivas_ism_param_enc_fx.c b/lib_enc/ivas_ism_param_enc_fx.c
index c2109877446cc8638fa9709bbe186515585baae5..f293131479c0ae019e8123c6fcd5c1e778401481 100644
--- a/lib_enc/ivas_ism_param_enc_fx.c
+++ b/lib_enc/ivas_ism_param_enc_fx.c
@@ -292,7 +292,11 @@ void ivas_param_ism_stereo_dmx_fx(
         {
             tmp = L_add( tmp, 2 * EVS_PI_FX );
         }
-        cardioid_left[i] = add( shr( alpha, 1 ), mult( sub( ONE_IN_Q15 - 1, alpha ), getCosWord16( extract_l( tmp ) ) ) ); // Q14
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+        cardioid_left[i] = mac_r( L_mult( alpha, 16384 ), sub( ONE_IN_Q15 - 1, alpha ), getCosWord16( extract_l( tmp ) ) ); // Q14
+#else
+        cardioid_left[i] = add( shr( alpha, 1 ), mult( sub( ONE_IN_Q15 - 1, alpha ), getCosWord16( extract_l( tmp ) ) ) );                     // Q14
+#endif
         move16();
 
         IF( st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame > 0 )
@@ -300,7 +304,11 @@ void ivas_param_ism_stereo_dmx_fx(
             Word16 last_cardioid_right;
             last_cardioid_right = sub( ONE_IN_Q14 /* 1.0f in Q14 */, last_cardioid_left );
             /* Smoothing */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+            cardioid_left[i] = mac_r( L_mult( 24576 /* 0.75f in Q15 */, cardioid_left[i] ), 8192 /* 0.25f in Q15 */, last_cardioid_left ); // Q14
+#else
             cardioid_left[i] = add( mult( 24576 /* 0.75f in Q15 */, cardioid_left[i] ), mult( 8192 /* 0.25f in Q15 */, last_cardioid_left ) ); // Q14
+#endif
             move16();
             Word32 grad_32 = L_mult( sub( cardioid_left[i], last_cardioid_left ), shl( one_by_input_frame, 1 ) /* 2.0f / (float) input_frame*/ ); /* Q14+Q16 = Q30 */ /* for the right cardioid, multiply with -1 */
             /* Cardioids sum up to 1 */
diff --git a/lib_enc/ivas_omasa_enc_fx.c b/lib_enc/ivas_omasa_enc_fx.c
index 4a620db480f7bb2e4839f6458c3cd48f1443dda0..49418c8fc35d5c845eb483bae2ff664d3918d409 100644
--- a/lib_enc/ivas_omasa_enc_fx.c
+++ b/lib_enc/ivas_omasa_enc_fx.c
@@ -1541,8 +1541,12 @@ static void ivas_omasa_dmx_fx(
                 {
                     g1 = interpolator[k];
                     move16();
-                    g2 = sub( MAX_WORD16, g1 );                                                                                                                    /*q15*/
+                    g2 = sub( MAX_WORD16, g1 ); /*q15*/
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+                    data_out[j][k] = L_add( data_out[j][k], Mpy_32_32( L_mac( L_mult( g1, gains[j] ), g2, prev_gains[i][j] ) /*q31*/, data_in[i][k] ) ); /*Qx*/
+#else
                     data_out[j][k] = L_add( data_out[j][k], Mpy_32_32( L_add( L_mult( g1, gains[j] ), L_mult( g2, prev_gains[i][j] ) ) /*q31*/, data_in[i][k] ) ); /*Qx*/
+#endif
                     move32();
                 }
             }
diff --git a/lib_enc/ivas_stereo_td_enc_fx.c b/lib_enc/ivas_stereo_td_enc_fx.c
index 029537a4e2fbb643f7fe301a6d2152b0624fbf4d..b26b688dc538948ad4b83c1e8bf6e1c547e80ff1 100644
--- a/lib_enc/ivas_stereo_td_enc_fx.c
+++ b/lib_enc/ivas_stereo_td_enc_fx.c
@@ -396,9 +396,15 @@ void tdm_configure_enc_fx(
 
     hStereoTD->tdm_use_IAWB_Ave_lpc = 0; /* Flag initialisation */
     move16();
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    sts[0]->hSpMusClas->tdm_lt_Etot_fx = mac_r( L_mult( 3277 /*0.1f in Q15*/, Etot_last_fx[0] ), 29491 /* 0.9f*/, sts[0]->hSpMusClas->tdm_lt_Etot_fx );
+    move16();
+    sts[1]->hSpMusClas->tdm_lt_Etot_fx = mac_r( L_mult( 3277 /*0.1f in Q15*/, Etot_last_fx[1] ), 29491 /* 0.9f*/, sts[1]->hSpMusClas->tdm_lt_Etot_fx );
+#else
     sts[0]->hSpMusClas->tdm_lt_Etot_fx = add( mult( 3277 /*0.1f in Q15*/, Etot_last_fx[0] ), mult( 29491 /* 0.9f*/, sts[0]->hSpMusClas->tdm_lt_Etot_fx ) );
     move16();
     sts[1]->hSpMusClas->tdm_lt_Etot_fx = add( mult( 3277 /*0.1f in Q15*/, Etot_last_fx[1] ), mult( 29491 /* 0.9f*/, sts[1]->hSpMusClas->tdm_lt_Etot_fx ) );
+#endif
     move16();
 
     test();
@@ -795,11 +801,21 @@ static void tdm_downmix_plain_ivas_fx(
 )
 {
     Word16 i;
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+    Word16 One_m_Ratio_fx16, ratio_L_fx16;
+    One_m_Ratio_fx16 = extract_h( One_m_Ratio_fx );
+    ratio_L_fx16 = extract_h( ratio_L_fx );
+#endif
 
     FOR( i = start_index; i < end_index; i++ )
     {
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+        FR_Y_fx[i] = mac_r( L_mult( Right_in_fx[i], One_m_Ratio_fx16 ), Left_in_fx[i], ratio_L_fx16 );
+        LR_X_fx[i] = msu_r( L_mult( Left_in_fx[i], One_m_Ratio_fx16 ), Right_in_fx[i], ratio_L_fx16 );
+#else
         FR_Y_fx[i] = add( mult( Right_in_fx[i], extract_h( One_m_Ratio_fx ) ), mult( Left_in_fx[i], extract_h( ratio_L_fx ) ) );
         LR_X_fx[i] = sub( mult( Left_in_fx[i], extract_h( One_m_Ratio_fx ) ), mult( Right_in_fx[i], extract_h( ratio_L_fx ) ) );
+#endif
         move16();
         move16();
     }
diff --git a/lib_enc/ivas_td_low_rate_enc_fx.c b/lib_enc/ivas_td_low_rate_enc_fx.c
index 8947bfb64903b670a123181f4939383d1a9ce04a..05fabedfed7a11d7a76ee3fc3c551ab2cba2dae5 100644
--- a/lib_enc/ivas_td_low_rate_enc_fx.c
+++ b/lib_enc/ivas_td_low_rate_enc_fx.c
@@ -302,7 +302,11 @@ void encod_gen_2sbfr(
         lp_filt_exc_enc_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
 
         /* update long-term pitch gain for speech/music classifier */
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+        st->hSpMusClas->lowrate_pitchGain = mac_r( L_mult( 29491, st->hSpMusClas->lowrate_pitchGain ), 3277 /*Q15*/, gain_pit ); // Q14
+#else
         st->hSpMusClas->lowrate_pitchGain = add( mult( 29491, st->hSpMusClas->lowrate_pitchGain ), mult( 3277 /*Q15*/, gain_pit ) ); // Q14
+#endif
         move16();
 
         /*-----------------------------------------------------------------*
diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c
index 7de83621a5cc1158f55c2aec57a360c4a28ac41d..6df7696bf172352d36d0903fb4ffa78635774d64 100644
--- a/lib_enc/swb_tbe_enc_fx.c
+++ b/lib_enc/swb_tbe_enc_fx.c
@@ -3986,7 +3986,11 @@ void swb_tbe_enc_ivas_fx(
             FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
             {
                 // GainShape[i] = ( 1 - feedback ) * GainShape[i] + feedback * GainShape_Interp[i];
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+                GainShape_fx[i] = extract_h( L_mac( L_mult( sub( MAX16B, feedback ), GainShape_fx[i] ), feedback, GainShape_Interp_fx[i] ) );
+#else
                 GainShape_fx[i] = extract_h( L_add( L_mult( sub( MAX16B, feedback ), GainShape_fx[i] ), L_mult( feedback, GainShape_Interp_fx[i] ) ) );
+#endif
                 move16();
             }
         }
@@ -4100,7 +4104,11 @@ void swb_tbe_enc_ivas_fx(
             FOR( i = 0; i < NUM_SHB_SUBGAINS; i++ )
             {
                 // GainShape[i] = ( 1 - feedback ) * GainShape[i * NUM_SHB_SUBGAINS] + feedback * GainShape_Interp[i];
+#ifdef FIX_2254_IMPROV_COMPLEXITY_BE
+                GainShape_fx[i] = extract_h( L_mac( L_mult( sub( MAX16B, feedback ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), feedback, GainShape_Interp_fx[i] ) ); // Q15
+#else
                 GainShape_fx[i] = extract_h( L_add( L_mult( sub( MAX16B, feedback ), GainShape_fx[i * NUM_SHB_SUBGAINS] ), L_mult( feedback, GainShape_Interp_fx[i] ) ) ); // Q15
+#endif
                 move16();
             }
 
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions_fx.c b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
index c2259e17630b178f0a63f8806d7feed5a344846a..0152bf465a270b99520b097404e72c8b69770fcb 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
@@ -2931,14 +2931,21 @@ static void ivas_dirac_dec_binaural_process_output_fx(
                 {
                     Word16 gain;
                     /* Mixing using the formulated processing matrix M */
-                    gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxRePrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxRe_fx[chA][chB][bin] ) ); // Q11
-
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                    gain = mac_r( L_mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxRePrev_fx[chA][chB][bin] ), interpVal_fx, hDiracDecBin->processMtxRe_fx[chA][chB][bin] ); // Q11
+#else
+                    gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxRePrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxRe_fx[chA][chB][bin] ) );           // Q11
+#endif
                     outSlotRe_fx[bin] = Madd_32_16( outSlotRe_fx[bin], inRe_fx[chB][slot][bin], gain ); // q_inp_mix-4//q_result
                     outSlotIm_fx[bin] = Madd_32_16( outSlotIm_fx[bin], inIm_fx[chB][slot][bin], gain ); // q_inp_mix-4//q_result
                     move32();
                     move32();
 
-                    gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxImPrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxIm_fx[chA][chB][bin] ) ); // Q11
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                    gain = mac_r( L_mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxImPrev_fx[chA][chB][bin] ), interpVal_fx, hDiracDecBin->processMtxIm_fx[chA][chB][bin] ); // Q11
+#else
+                    gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxImPrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxIm_fx[chA][chB][bin] ) );           // Q11
+#endif
                     // interpVal * hDiracDecBin->processMtxIm[chA][chB][bin];
                     outSlotRe_fx[bin] = Msub_32_16( outSlotRe_fx[bin], inIm_fx[chB][slot][bin], gain ); // q_inp_mix-4//q_result
                     outSlotIm_fx[bin] = Madd_32_16( outSlotIm_fx[bin], inRe_fx[chB][slot][bin], gain ); // q_inp_mix-4//q_result
@@ -2949,7 +2956,11 @@ static void ivas_dirac_dec_binaural_process_output_fx(
                     test();
                     IF( LT_16( bin, max_band_decorr ) && LT_16( chB, 2 ) )
                     {
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                        gain = mac_r( L_mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxDecRePrev_fx[chA][chB][bin] ), interpVal_fx, hDiracDecBin->processMtxDecRe_fx[chA][chB][bin] ); // Q11
+#else
                         gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxDecRePrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxDecRe_fx[chA][chB][bin] ) ); // Q11
+#endif
                         // interpVal * hDiracDecBin->processMtxDecRe[chA][chB][bin];
 
                         outSlotRe_fx[bin] = Madd_32_16( outSlotRe_fx[bin], decSlotRePointer_fx[bin], gain ); // q_inp_mix-4//q_result
@@ -2957,8 +2968,11 @@ static void ivas_dirac_dec_binaural_process_output_fx(
                         move32();
                         move32();
 
+#ifdef FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE
+                        gain = mac_r( L_mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxDecImPrev_fx[chA][chB][bin] ), interpVal_fx, hDiracDecBin->processMtxDecIm_fx[chA][chB][bin] ); // Q11
+#else
                         gain = add( mult( sub( 32767, interpVal_fx ), hDiracDecBin->processMtxDecImPrev_fx[chA][chB][bin] ), mult( interpVal_fx, hDiracDecBin->processMtxDecIm_fx[chA][chB][bin] ) ); // Q11
-
+#endif
                         outSlotRe_fx[bin] = Msub_32_16( outSlotRe_fx[bin], decSlotImPointer_fx[bin], gain ); // q_inp_mix-4//q_result
                         outSlotIm_fx[bin] = Madd_32_16( outSlotIm_fx[bin], decSlotRePointer_fx[bin], gain ); // q_inp_mix-4//q_result
                         move32();