diff --git a/lib_com/options.h b/lib_com/options.h
index 597cbad5ceff31c96190bb70f9b4c08f55e9fd16..adc98c7d453263ce956339be0f25e23f203d8338 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -175,6 +175,7 @@
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
 #define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */
 #define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */
+#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index a303c6d65b0f55de9ebaeb761d3b060081f6b8c0..0b04eedb3b05b8eec7e9dca9dbc8ca1d0a566e82 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2305,7 +2305,18 @@ ivas_error ivas_init_decoder(
 
     if ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX )
     {
-        delay_ns = st_ivas->binaural_latency_ns;
+#ifdef NONBE_1360_LFE_DELAY
+        if ( st_ivas->hIntSetup.index_lfe[0] != -1 )
+        {
+            delay_ns = st_ivas->binaural_latency_ns;
+        }
+        else
+        {
+            delay_ns = 0;
+        }
+#else
+        int32_t delay_ns = st_ivas->binaural_latency_ns;
+#endif
         if ( st_ivas->hBinRenderer != NULL )
         {
             if ( st_ivas->hBinRenderer->render_lfe )
diff --git a/lib_dec/ivas_lfe_dec.c b/lib_dec/ivas_lfe_dec.c
index eed016b09f65566a60f4f0e17d3a4d63fbaa1e8f..e734f1e0fdc24174fa5ee11d4d2c80f0a43d3671 100644
--- a/lib_dec/ivas_lfe_dec.c
+++ b/lib_dec/ivas_lfe_dec.c
@@ -380,7 +380,11 @@ ivas_error ivas_create_lfe_dec(
     LFE_DEC_HANDLE hLFE;
     float lfe_addl_delay_s;
     int16_t i, j;
+#ifndef NONBE_1360_LFE_DELAY
     int16_t add_delay_sa;
+#else
+    float lfe_block_delay_s;
+#endif
 
     low_pass_delay_dec_out = 0;
     block_offset_s = 0;
@@ -418,7 +422,11 @@ ivas_error ivas_create_lfe_dec(
     hLFE->cum_freq_models[1][3] = &ivas_str_lfe_freq_models.entropy_coder_model_coarse_sg4;
 
     /* delay calculation */
+#ifndef NONBE_1360_LFE_DELAY
     hLFE->lfe_block_delay_s = ( IVAS_LFE_FADE_NS / 1000000000.f ) + ivas_lfe_lpf_delay[IVAS_FILTER_ORDER_4 - 3];
+#else
+    lfe_block_delay_s = ( IVAS_LFE_FADE_NS / 1000000000.f ) + ivas_lfe_lpf_delay[IVAS_FILTER_ORDER_4 - 3];
+#endif
 
     block_offset_s = BLOCK_OFFSET_MS * 0.001f;
     filt_order = 0;
@@ -426,21 +434,40 @@ ivas_error ivas_create_lfe_dec(
     if ( ( delay_ns / 1000000000.f ) > ivas_lfe_lpf_delay[IVAS_FILTER_ORDER_4 - 3] )
     {
         filt_order = 4;
+#ifdef NONBE_1360_LFE_DELAY
+        low_pass_delay_dec_out = ivas_lfe_lpf_delay[IVAS_FILTER_ORDER_4 - 3];
+#else
         low_pass_delay_dec_out = ivas_lfe_lpf_delay[IVAS_FILTER_ORDER_4 - 3] * 1000000000.f;
+#endif
         ivas_create_lfe_lpf_dec( &( hLFE->filter_state ), output_Fs );
     }
 
     hLFE->filter_state.order = filt_order;
+#ifndef NONBE_1360_LFE_DELAY
     hLFE->lfe_block_delay_s = hLFE->lfe_block_delay_s + low_pass_delay_dec_out;
+#else
+    lfe_block_delay_s = lfe_block_delay_s + low_pass_delay_dec_out;
+#endif
     hLFE->lfe_prior_buf_len = NS2SA( output_Fs, IVAS_LFE_FADE_NS );
 
     hLFE->bfi_count = 0;
-
+#ifdef NONBE_1360_LFE_DELAY
+    block_offset_s += delay_ns / 1000000000.f;
+    lfe_addl_delay_s = block_offset_s - lfe_block_delay_s;
+#else
     lfe_addl_delay_s = block_offset_s - hLFE->lfe_block_delay_s;
+#endif
+
     lfe_addl_delay_s = max( 0.0f, lfe_addl_delay_s );
+#ifndef NONBE_1360_LFE_DELAY
     add_delay_sa = (int16_t) roundf( (float) delay_ns * output_Fs / 1000000000.f );
     hLFE->lfe_addl_delay = (int16_t) ( lfe_addl_delay_s * output_Fs ) + add_delay_sa;
     hLFE->lfe_block_delay_s += lfe_addl_delay_s + add_delay_sa / output_Fs;
+    hLFE->lfe_block_delay_s += lfe_addl_delay_s;
+#else
+    hLFE->lfe_addl_delay = (int16_t) ( lfe_addl_delay_s * output_Fs );
+    hLFE->delay_ns = delay_ns;
+#endif
 
     if ( hLFE->lfe_addl_delay > 0 )
     {
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c
index c06e8b3fa18632bff589fa6d452bcd57394a3f1b..049cc120b3113a592fbdbf88e8d7e79143ddb326 100644
--- a/lib_dec/ivas_mc_paramupmix_dec.c
+++ b/lib_dec/ivas_mc_paramupmix_dec.c
@@ -844,22 +844,37 @@ static void ivas_mc_paramupmix_dec_sf(
         {
             for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ )
             {
-                float tmp_buf[L_SUBFRAME5MS_48k];
-                mvr2r( &output_f[ch][n_samples_rendered - noparamupmix_delay], tmp_buf, noparamupmix_delay );
-                mvr2r( output_f[ch], &output_f[ch][noparamupmix_delay], n_samples_rendered - noparamupmix_delay );
-                mvr2r( hMCParamUpmix->pcm_delay[ch], output_f[ch], noparamupmix_delay );
-                mvr2r( tmp_buf, hMCParamUpmix->pcm_delay[ch], noparamupmix_delay );
+#ifdef NONBE_1360_LFE_DELAY
+                /*delay is handled within LFE decoder*/
+                if ( st_ivas->hIntSetup.index_lfe[0] != ch )
+                {
+#endif
+                    float tmp_buf[L_SUBFRAME5MS_48k];
+                    mvr2r( &output_f[ch][n_samples_rendered - noparamupmix_delay], tmp_buf, noparamupmix_delay );
+                    mvr2r( output_f[ch], &output_f[ch][noparamupmix_delay], n_samples_rendered - noparamupmix_delay );
+                    mvr2r( hMCParamUpmix->pcm_delay[ch], output_f[ch], noparamupmix_delay );
+                    mvr2r( tmp_buf, hMCParamUpmix->pcm_delay[ch], noparamupmix_delay );
+#ifdef NONBE_1360_LFE_DELAY
+                }
+#endif
             }
         }
         else
         {
             for ( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ )
             {
-                float tmp_buf[L_SUBFRAME5MS_48k];
-                mvr2r( &output_f[ch][0], tmp_buf, n_samples_rendered );
-                mvr2r( hMCParamUpmix->pcm_delay[ch], output_f[ch], n_samples_rendered );
-                mvr2r( &hMCParamUpmix->pcm_delay[ch][n_samples_rendered], &hMCParamUpmix->pcm_delay[ch][0], noparamupmix_delay - n_samples_rendered );
-                mvr2r( tmp_buf, &hMCParamUpmix->pcm_delay[ch][noparamupmix_delay - n_samples_rendered], n_samples_rendered );
+#ifdef NONBE_1360_LFE_DELAY
+                if ( st_ivas->hIntSetup.index_lfe[0] != ch )
+                {
+#endif
+                    float tmp_buf[L_SUBFRAME5MS_48k];
+                    mvr2r( &output_f[ch][0], tmp_buf, n_samples_rendered );
+                    mvr2r( hMCParamUpmix->pcm_delay[ch], output_f[ch], n_samples_rendered );
+                    mvr2r( &hMCParamUpmix->pcm_delay[ch][n_samples_rendered], &hMCParamUpmix->pcm_delay[ch][0], noparamupmix_delay - n_samples_rendered );
+                    mvr2r( tmp_buf, &hMCParamUpmix->pcm_delay[ch][noparamupmix_delay - n_samples_rendered], n_samples_rendered );
+#ifdef NONBE_1360_LFE_DELAY
+                }
+#endif
             }
         }
     }
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 8fb966c36518fb51edbce486791ec79dd5ba17b3..28f5321a3a7a2358e9c5f4151c1441a8c16cb459 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -1077,6 +1077,7 @@ static ivas_error ivas_mc_dec_reconfig(
         return error;
     }
 
+#ifndef NONBE_1360_LFE_DELAY
     /*-----------------------------------------------------------------*
      * Allocate the LFE handle that is coded separately after the allocation of the core coders
      *-----------------------------------------------------------------*/
@@ -1112,6 +1113,7 @@ static ivas_error ivas_mc_dec_reconfig(
         set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN );
         set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k );
     }
+#endif
 
     /*-----------------------------------------------------------------*
      * Reconfigure renderers
@@ -1264,6 +1266,77 @@ static ivas_error ivas_mc_dec_reconfig(
         return error;
     }
 
+
+#ifdef NONBE_1360_LFE_DELAY
+    /*-----------------------------------------------------------------*
+     * Allocate the LFE handle that is coded separately after the allocation of the core coders
+     *-----------------------------------------------------------------*/
+#ifdef NONBE_1360_LFE_DELAY
+    if ( ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )
+#else
+    if ( ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && st_ivas->hLFE == NULL )
+#endif
+    {
+#ifdef NONBE_1360_LFE_DELAY
+        int32_t delay_ns;
+        if ( st_ivas->hIntSetup.index_lfe[0] != -1 )
+        {
+            delay_ns = st_ivas->binaural_latency_ns;
+        }
+        else
+        {
+            delay_ns = 0;
+        }
+#else
+        int32_t delay_ns = st_ivas->binaural_latency_ns;
+#endif
+        if ( st_ivas->hBinRenderer != NULL )
+        {
+            if ( st_ivas->hBinRenderer->render_lfe )
+            {
+                /* Account for filterbank delay */
+                delay_ns += IVAS_FB_DEC_DELAY_NS;
+            }
+            else
+            {
+                delay_ns = 0;
+            }
+        }
+        else
+        {
+            if ( ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && ( st_ivas->cldfbSynDec[0] != NULL ) )
+            {
+                delay_ns += IVAS_FB_DEC_DELAY_NS;
+            }
+        }
+
+#ifdef NONBE_1360_LFE_DELAY
+        if ( st_ivas->hLFE != NULL )
+        {
+            if ( st_ivas->hLFE->delay_ns != delay_ns )
+            {
+                ivas_lfe_dec_close( &( st_ivas->hLFE ) );
+            }
+        }
+#endif
+
+#ifdef NONBE_1360_LFE_DELAY
+        if ( st_ivas->hLFE == NULL )
+        {
+#endif
+            if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, st_ivas->hDecoderConfig->output_Fs, delay_ns ) ) != IVAS_ERR_OK )
+            {
+                return error;
+            }
+
+            set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN );
+            set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k );
+#ifdef NONBE_1360_LFE_DELAY
+        }
+#endif
+    }
+#endif
+
     /*-----------------------------------------------------------------*
      * JBM TC buffers
      *-----------------------------------------------------------------*/
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index 282d798e4d66fac476e7efd50bf06fd0957a63a9..1d04bea71fb0d1eb0b6d07d01af97ac43f19d8d8 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -790,7 +790,11 @@ typedef struct ivas_lfe_dec_data_structure
     LFE_WINDOW_HANDLE pWindow_state;
     const uint16_t *cum_freq_models[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS];
     int16_t lfe_dec_indices_coeffs_tbl[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS];
+#ifdef NONBE_1360_LFE_DELAY
+    int32_t delay_ns;
+#else
     float lfe_block_delay_s;
+#endif
     int16_t lfe_prior_buf_len;
     float prior_out_buffer[L_FRAME48k];