diff --git a/lib_com/options.h b/lib_com/options.h
index 0c7bdc53af3f9e814242ff1ca6bf18a51c2fb9e5..3781b07be2f3e0d81cc029fa96a9576b05e1354a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -61,6 +61,11 @@
 #define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/
 #define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */
 #define NONBE_FIX_738_QUATERNION_SLERP_PRECISION        /* Philips: issue 738: Quaternion spherical linear interpolation precision handling issues */
+#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */
+#define FIX_976_USAN_PVQ_ENC_DEC_EVS_CR                 /* Ericsson:  premature cast to unsigned detected by USAN corrected  */
+#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */
+#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */
+#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */
 #define NONBE_FIX_1069_SVD_TUNING                       /* FhG: issue 1069: tune SVD constants */
 #define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO           /* Eri: Issue 1010: Division by zero in Stereo CNG */
 /* #################### End FIXES switches ############################ */
diff --git a/lib_dec/gs_dec.c b/lib_dec/gs_dec.c
index ba9c574afdb3e1601033678cb6165a2226a4cc0f..0395f5419388a2d7dcbb0ec912c2cbac59e46a60 100644
--- a/lib_dec/gs_dec.c
+++ b/lib_dec/gs_dec.c
@@ -640,7 +640,11 @@ void gsc_dec(
                 }
                 if ( concat_out[j] < 0 )
                 {
+#ifdef FIX_1027_GSC_INT_OVERFLOW
+                    seed_init = (int16_t) ( (int32_t) seed_init + 3 );
+#else
                     seed_init += 3;
+#endif
                 }
             }
 
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 0212b00b528b5383efaf7a74826a638e1d9955b2..df074a1d01fbf308602a734c0b581d204e158270 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -1140,8 +1140,15 @@ static ivas_error ivas_mc_dec_reconfig(
 
             if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )
             {
-                ivas_td_binaural_close( &st_ivas->hBinRendererTd );
-                st_ivas->hHrtfTD = NULL;
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
+                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
+                {
+#endif
+                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );
+                    st_ivas->hHrtfTD = NULL;
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
+                }
+#endif
             }
 
             if ( st_ivas->hDiracDecBin != NULL )
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 6bf9cdfdd403bfb0134d31ab8f4acfb035ad26cc..9f8039495b51b368390266dd9e6f65bd434d404c 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -310,10 +310,17 @@ ivas_error ivas_omasa_dec_config(
             if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
             {
                 /* Allocate TD renderer for the objects in DISC mode */
-                if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
+                if ( st_ivas->hBinRendererTd == NULL )
                 {
-                    return error;
+#endif
+                    if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
+                    {
+                        return error;
+                    }
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
                 }
+#endif
 
                 /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
                 if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -324,8 +331,16 @@ ivas_error ivas_omasa_dec_config(
             else
             {
                 /* TD renderer handle */
-                ivas_td_binaural_close( &st_ivas->hBinRendererTd );
-                st_ivas->hHrtfTD = NULL;
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
+                if ( st_ivas->hBinRendererTd != NULL && st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )
+                {
+#endif
+                    /* TD renderer handle */
+                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );
+                    st_ivas->hHrtfTD = NULL;
+#ifdef FIX_1033_MEMORY_LEAK_OMASA
+                }
+#endif
 
                 /* ISM renderer handle + ISM data handle */
                 ivas_omasa_separate_object_renderer_close( st_ivas );
diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c
index d8487479f0d2f3efd3f0cc1c5cb487c51bf7c0a9..77da09008c1fa336b6aef5d007b5bf830157c4b5 100644
--- a/lib_dec/ivas_sba_dirac_stereo_dec.c
+++ b/lib_dec/ivas_sba_dirac_stereo_dec.c
@@ -384,10 +384,23 @@ static void map_params_dirac_to_stereo(
                 }
             }
 
+#ifdef NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO
+            /* Clamp values here. [-1, 1] is the allowed range, but due to precision issues they can be slightly off which can cause problems later. */
             side_gain[b] *= sqrtf( 1.f - diffuseness[b] );
+            side_gain[b] = max( min( side_gain[b], 1 ), -1 );
             side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] );
+            side_gain[b + STEREO_DFT_BAND_MAX] = max( min( side_gain[b + STEREO_DFT_BAND_MAX], 1 ), -1 );
+            /* for residual prediction gain, allowed range is [0, 1]*/
             res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] );
+            res_pred_gain[b] = max( min( res_pred_gain[b], 1 ), 0 );
             res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] );
+            res_pred_gain[b + STEREO_DFT_BAND_MAX] = max( min( res_pred_gain[b + STEREO_DFT_BAND_MAX], 1 ), 0 );
+#else
+            side_gain[b] *= sqrtf( 1.f - diffuseness[b] );
+            side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] );
+            res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] );
+            res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] );
+#endif
         }
     }
 
diff --git a/lib_dec/pvq_core_dec.c b/lib_dec/pvq_core_dec.c
index 677b80f5c09b8aa6d4a72a7720f1e14d1880d319..49a3e4f97dd014d0448b2dbd202d6ac144e1d7b8 100644
--- a/lib_dec/pvq_core_dec.c
+++ b/lib_dec/pvq_core_dec.c
@@ -109,8 +109,18 @@ static void pvq_decode_band(
 
     for ( j = 0; j < Np; j++ )
     {
+#ifdef FIX_976_USAN_PVQ_ENC_DEC_EVS_CR
         g_part[j] = -( (float) g_part_s[j] ) / 32768;
+        /* note: here  g_part   needs to be become exactly  1.0(float) thus in BASOP  Word16 g_part_s is in the negative Q15 domain */
+#endif
+
+
+#ifdef FIX_976_USAN_PVQ_ENC_DEC_EVS_CR
+        /* aligned to BASOP to avoid USAN undefined negation warning for -(-32768) */
+        g_part_s[j] = negate( g_part_s[j] );
+#else
         g_part_s[j] = -g_part_s[j];
+#endif
     }
 
     srt_vec_ind( g_part_s, sg_part, idx_sort, Np );
@@ -416,7 +426,11 @@ static void densitySymbolIndexDecode(
     {
         tot = res * ( res + 1 ) + 1;
         dec_freq = rc_decode( &st->BER_detect, hPVQ, tot );
+#ifdef FIX_976_USAN_PVQ_ENC_DEC_EVS_CR
+        alpha = (int16_t) floor_sqrt_exact( (uint32_t) ( ( res + 1 ) * ( res + 1 ) - dec_freq ) ) + res + 1;
+#else
         alpha = (int16_t) floor_sqrt_exact( (uint32_t) ( res + 1 ) * ( res + 1 ) - dec_freq ) + res + 1;
+#endif
         sym_freq = 2 * ( res - alpha ) + 1;
         cum_freq = alpha * ( 2 * ( res + 1 ) - alpha );
     }
@@ -434,7 +448,11 @@ static void densitySymbolIndexDecode(
         dec_freq = rc_decode( &st->BER_detect, hPVQ, tot );
         if ( dec_freq < tot - ( res + 1 ) - ( res - ( c + 1 ) ) * ( res - c ) * c + c + 1 )
         {
+#ifdef FIX_976_USAN_PVQ_ENC_DEC_EVS_CR
+            alpha = ( res_c - 1 + (int16_t) floor_sqrt_exact( (uint32_t) ( res_c * ( res_c + 4 * dec_freq - 2 ) + 1 ) ) ) / ( 2 * res_c );
+#else
             alpha = ( res_c - 1 + (int16_t) floor_sqrt_exact( (uint32_t) res_c * ( res_c + 4 * dec_freq - 2 ) + 1 ) ) / ( 2 * res_c );
+#endif
             sym_freq = 2 * alpha * res_c + 1;
             cum_freq = alpha * ( ( alpha - 1 ) * res_c + 1 );
         }
diff --git a/lib_dec/updt_dec.c b/lib_dec/updt_dec.c
index 9ee8093ffc0ea4e1055819d6aaf33c93fb7ca1c1..658c362df4295a6fe880db54b1ee1408f116c18a 100644
--- a/lib_dec/updt_dec.c
+++ b/lib_dec/updt_dec.c
@@ -518,7 +518,11 @@ void updt_dec_common(
         st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt;
     }
 
+#ifdef NON_BE_1055_RESET_LP_MEMORIES
+    if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )
+#else
     if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )
+#endif
     {
         /* reset LP memories */
         set_zero( st->mem_MA, M );
diff --git a/lib_enc/core_enc_updt.c b/lib_enc/core_enc_updt.c
index 1e17f7822dba420cc63e6d14e4bd14dc251cbedb..16a2118d56b281d3c854f22024ea00a703a8891b 100644
--- a/lib_enc/core_enc_updt.c
+++ b/lib_enc/core_enc_updt.c
@@ -89,7 +89,11 @@ void core_encode_update(
         }
     }
 
+#ifdef NON_BE_1055_RESET_LP_MEMORIES
+    if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) ) )
+#else
     if ( ( st->Opt_DTX_ON && st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) )
+#endif
     {
         /* reset LP memories */
         set_zero( st->mem_MA, M );
diff --git a/lib_enc/gs_enc.c b/lib_enc/gs_enc.c
index c22285436ce4bf52ea65307891b84c76577a04a7..02456d250428acfca55ad20936add7c9a0db8f2e 100644
--- a/lib_enc/gs_enc.c
+++ b/lib_enc/gs_enc.c
@@ -542,7 +542,11 @@ void gsc_enc(
             }
             if ( concat_out[j] < 0 )
             {
+#ifdef FIX_1027_GSC_INT_OVERFLOW
+                seed_init = (int16_t) ( (int32_t) seed_init + 3 );
+#else
                 seed_init += 3;
+#endif
             }
         }
 
diff --git a/lib_enc/pvq_core_enc.c b/lib_enc/pvq_core_enc.c
index 0a8b7954d5faaf616735199718ab0f8b196ddd5e..03d5b1995d4c28a848e883a3f305b282e1f45de2 100644
--- a/lib_enc/pvq_core_enc.c
+++ b/lib_enc/pvq_core_enc.c
@@ -121,7 +121,12 @@ static void pvq_encode_band(
     for ( j = 0; j < Np; j++ )
     {
         g_part[j] = -( (float) g_part_s[j] ) / 32768;
+#ifdef FIX_976_USAN_PVQ_ENC_DEC_EVS_CR
+        /* aligned to BASOP to avoid USAN undefined negation warning with -(-32768) */
+        g_part_s[j] = negate( g_part_s[j] );
+#else
         g_part_s[j] = -g_part_s[j];
+#endif
     }
 
     srt_vec_ind( g_part_s, sg_part, idx_sort, Np );