diff --git a/lib_com/options.h b/lib_com/options.h
index c09e1ff3d56e7459bd22070d9bf45b84d1830eb0..d9b0e44a8cb1c98287057607b07a9b97376be0b7 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -116,6 +116,7 @@
 #define FIX_BASOP_2531_MCT_CP_BITRATE                   /* FhG: BASOP issue 2531: Fix MCT cp_bitrate calculation; affects bitrate switching only */
 #define FIX_BASOP_2541_OMASA_ENC_FIXES                  /* Nokia: BASOP issue 2541: Fix function ivas_encode_masaism_metadata_fx */
 #define FIX_BASOP_2545_FIX_LTV_REGRESSION_2529          /* Nokia: BASOP issue 2545: Fix LTV regression caused by issue 2529 fix */
+#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC         /* VA : Basop issue yyyy: Align conditions in core sw dec */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c
index 2a7ee9fdbcb1c67571b76eb9759ae59a9e9f396e..d44f0c9c0eab5dc38e7b36264ee385b5c5c87a2c 100644
--- a/lib_dec/core_switching_dec_fx.c
+++ b/lib_dec/core_switching_dec_fx.c
@@ -183,7 +183,12 @@ void bw_switching_pre_proc_fx(
     {
         st_fx->prev_ener_shb_fx = 0;
         move16();
-        set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );
+#ifdef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC
+        IF ( st_fx->hBWE_FD != NULL )
+#endif
+        {
+            set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );
+        }
     }
     ELSE IF( ( ( st_fx->core == ACELP_CORE && ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) ) ) || ( EQ_16( st_fx->core, st_fx->last_core ) && NE_16( st_fx->extl, st_fx->last_extl ) ) ) && GE_16( st_fx->last_bwidth, SWB ) )
     {
@@ -567,7 +572,11 @@ ivas_error core_switching_post_dec_fx(
                 hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );
                 move32();
             }
+#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC
             IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && EQ_32( st_fx->core_brate, HQ_32k ) ) )
+#else
+            IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && LE_32( st_fx->core_brate, HQ_32k ) ) )
+#endif
             {
                 set32_fx( hHQ_core->prev_env_fx, 0, SFM_N_WB );
                 set32_fx( hHQ_core->prev_normq_fx, 0, SFM_N_WB );
@@ -725,9 +734,19 @@ ivas_error core_switching_post_dec_fx(
     test();
     test();
     test();
-    IF( ( st_fx->hBWE_FD != NULL ) && ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) || ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) ||
-                                        ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) && st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) || ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )
+#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS
+    IF( ( st_fx->hBWE_FD != NULL ) &&
+        ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) || ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) || ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) && st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) || ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )
+#else
+    IF( st_fx->hBWE_FD != NULL &&
+        ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) ||
+          ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) ||
+          ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&
+            st_fx->extl < 0 && EQ_16( st_fx->core, ACELP_CORE ) ) ||
+          ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && NE_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )
+#endif
     {
+
         set16_fx( hBWE_FD->L_old_wtda_swb_fx, 0, output_frame );
         hBWE_FD->old_wtda_swb_fx_exp = 0;
         move16();
@@ -852,7 +871,11 @@ ivas_error core_switching_post_dec_fx(
 
         /* reset WB TBE buffers */
         test();
+#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC
         IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) )
+#else
+        IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) && NE_16( st_fx->last_core, TCX_20_CORE ) && NE_16( st_fx->last_core, TCX_10_CORE ) )
+#endif
         {
             wb_tbe_extras_reset_fx( hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );
             wb_tbe_extras_reset_synth_fx( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_32and48k_WB_upsample_fx, hBWE_TD->mem_resamp_HB_fx );