diff --git a/lib_com/options.h b/lib_com/options.h
index dd32167b9169ff4864904770b674463b566e938b..7cf217402abe0b1d1f15fcc32a1d99ec73638540 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -104,4 +104,6 @@
 #define ISSUE_1751_replace_shl_ro               /*FhG: replace shl_ro by overflow-free alternatives*/
 #define ISSUE_1770_replace_shr_ro               /* FhG: replace by non-overflow-alternative - BE */
 
+#define FIX_1735_W_SHL_SAT_L                    /* FhG: Usage of W_shl_sat_l() */
+
 #endif
diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c
index ba774171218d4f0a586e3e6844851a56c5d3ca88..69983cbf2a8c89355dd93a9c2baef62b5ceba279 100644
--- a/lib_dec/ivas_dirac_dec_fx.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -2009,7 +2009,11 @@ void ivas_dirac_dec_set_md_map(
                 tmp_fx = W_add_nosat( tmp_fx, W_deposit32_l( L_deposit_l( hSpatParamRendCom->render_to_md_map[slot_idx_abs] ) ) );
                 slot_idx_abs = add( slot_idx_abs, 1 );
             }
+#ifdef FIX_1735_W_SHL_SAT_L
+            iDiv_and_mod_32( W_shl_sat_l( tmp_fx, 16 ), hSpatParamRendCom->subframe_nbslots[sf_idx], &quo, &rem, 0 );
+#else
             iDiv_and_mod_32( W_extract_l( W_shl_nosat( tmp_fx, 16 ) ), hSpatParamRendCom->subframe_nbslots[sf_idx], &quo, &rem, 0 );
+#endif
             hSpatParamRendCom->render_to_md_map[sf_idx] = add( round_fx( quo ), hSpatParamRendCom->dirac_read_idx ) % hSpatParamRendCom->dirac_md_buffer_length;
             move16();
         }
diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c
index 8541decd87909bc65c3d4e0f4d0912c51fc78de0..0d42e5ff219f881f2fed2fb8bfb20cf00e109df0 100644
--- a/lib_enc/analy_sp_fx.c
+++ b/lib_enc/analy_sp_fx.c
@@ -321,7 +321,11 @@ static void find_enr_dft_ivas_fx(
         }
 
         /* normalization per frequency bin */
-        band_fx[i] = W_extract_h( W_shl( band_ener, sub( Q16, shift ) ) ); // *q_band
+#ifdef FIX_1735_W_SHL_SAT_L
+        band_fx[i] = W_shl_sat_l( band_ener, sub( Q16 - 32, shift ) ); // *q_band
+#else
+        band_fx[i] = W_extract_h( W_shl( band_ener, sub( Q16, shift ) ) );                                                                                                            // *q_band
+#endif
         move32();
 
         /* per band energy without E_MIN   */
diff --git a/lib_enc/ivas_enc_cov_handler_fx.c b/lib_enc/ivas_enc_cov_handler_fx.c
index 495e6caa106cdc55a2165c5655ee104814982737..8b4509f49745d4ec4f7a39720b22e0142de70874 100644
--- a/lib_enc/ivas_enc_cov_handler_fx.c
+++ b/lib_enc/ivas_enc_cov_handler_fx.c
@@ -224,7 +224,11 @@ static Word16 ivas_spar_get_activeW_flag_fx(
         q_shift = Q31;
         move16();
         q_shift = W_norm( bb_var_64bit[ch] );
+#ifdef FIX_1735_W_SHL_SAT_L
+        bb_var[ch] = W_shl_sat_l( bb_var_64bit[ch], sub( q_shift, 32 ) ); /* q_bb_var[ch] + sub( q_shift, 32 ) */
+#else
         bb_var[ch] = W_extract_l( W_shl_nosat( bb_var_64bit[ch], sub( q_shift, 32 ) ) ); /* q_bb_var[ch] + sub( q_shift, 32 ) */
+#endif
         move32();
         q_bb_var[ch] = add( q_bb_var[ch], sub( q_shift, 32 ) );
         move16();
@@ -564,7 +568,7 @@ static void ivas_band_cov_fx(
                 pV_re[k] = W_shl_sat_l( pV_re_64bit[k], q_shift_tmp ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32)
                 move32();
 #else
-                pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], q_shift_tmp ) ); //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32)
+                pV_re[k] = W_extract_l( W_shl_nosat( pV_re_64bit[k], q_shift_tmp ) );    //(q_In_FR[i1] + q_In_FR[j1]) + (q_shift - 32)
                 move32();
 #endif
                 /* perform rounding towards lower value for negative results */