diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index cfd26f77258f762d3aea756f339c821099f46088..5c8eeef8b7fce0b945fc02fc5c384fed561899bd 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1219,6 +1219,9 @@ enum
 #define MASA_BIT_REDUCT_PARAM                   10
 #define MASA_MAXIMUM_TWO_DIR_BANDS              24
 #define NBITS_HR_COH                            4
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+#define OMASA_TDREND_MATCHING_GAIN              0.7943f
+#endif
 
 #define MASA_JBM_RINGBUFFER_FRAMES              3
 
diff --git a/lib_com/options.h b/lib_com/options.h
index e28f39446973f98872bb0121828fb97ba5953e5d..9d11367b97707924db458a751f770562482c9c89 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -169,7 +169,7 @@
 #define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   
 #define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */  
 #define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */                                                                                        
-
+#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c
index 9fcb8f9f4305b7e885c792c999137836a22edbbe..6e166a21c827fc5f3e136ca53c606dc8c924d704 100644
--- a/lib_dec/ivas_ism_renderer.c
+++ b/lib_dec/ivas_ism_renderer.c
@@ -523,6 +523,7 @@ void ivas_omasa_separate_object_render_jbm(
 
     for ( obj = 0; obj < num_objects; obj++ )
     {
+#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
         /* Delay the signal to match CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
         if ( slots_rendered == 0 )
         {
@@ -531,6 +532,7 @@ void ivas_omasa_separate_object_render_jbm(
             tcBufferSize = hSpatParamRendCom->num_slots * hSpatParamRendCom->slot_size;
             delay_signal( input_f[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer[obj], st_ivas->hMasaIsmData->delayBuffer_size );
         }
+#endif
         offsetSamples = 0;
 
         for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 7c6f1fdfa687948b042ea942d4f90d98af90ea2b..7fe4d9251fe4acf1634c83ae3ea040951112d0a5 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -892,6 +892,31 @@ void ivas_jbm_dec_feed_tc_to_renderer(
         {
             ivas_ism_dec_digest_tc( st_ivas );
         }
+
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_DIRAC )
+        {
+            int16_t num_objects;
+            /* Delay the signal to match CLDFB delay. Delay the whole buffer. */
+            num_objects = 0;
+            if ( ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ ) && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC )
+            {
+                num_objects = 1;
+            }
+            else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+            {
+                num_objects = st_ivas->nchan_ism;
+            }
+            for ( n = 0; n < num_objects; n++ )
+            {
+                if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC )
+                {
+                    v_multc( st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], OMASA_TDREND_MATCHING_GAIN, st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );
+                }
+                delay_signal( st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
+            }
+        }
+#endif
     }
     else if ( st_ivas->ivas_format == MC_FORMAT )
     {
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 33a504bae706fff4046d25c9dc2a2a5fcda3e332..7e58dfe790ffa9f99ba0663f04d41262196c3de8 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -42,13 +42,13 @@
 #endif
 #include "wmc_auto.h"
 
-
+#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
 /*-------------------------------------------------------------------------
  * Local constants
  *------------------------------------------------------------------------*/
 
 #define OMASA_TDREND_MATCHING_GAIN 0.7943f
-
+#endif
 /*-------------------------------------------------------------------*
  * ivas_omasa_data_open()
  *
@@ -593,17 +593,34 @@ void ivas_omasa_dirac_rend_jbm(
     int16_t n;
     float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
 
-    if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+    if ( !st_ivas->hDecoderConfig->Opt_tsm )
     {
+        *nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
+#endif
+
+        if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+        {
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+            mvr2r( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
+#else
         mvr2r( output_f[CPE_CHANNELS], data_separated_objects[0], nSamplesAsked );
-    }
-    else
-    {
-        for ( n = 0; n < st_ivas->nchan_ism; n++ )
+#endif
+        }
+        else
         {
+            for ( n = 0; n < st_ivas->nchan_ism; n++ )
+            {
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+                mvr2r( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
+#else
             mvr2r( output_f[n + CPE_CHANNELS], data_separated_objects[n], nSamplesAsked );
+#endif
+            }
         }
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     }
+#endif
 
     subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
     slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
@@ -633,16 +650,21 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm(
 {
     int16_t n;
     float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];
+#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     float gain = OMASA_TDREND_MATCHING_GAIN;
+#endif
     ivas_error error;
     float *p_sepobj[MAX_NUM_OBJECTS];
+#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     float *tc_local[MAX_TRANSPORT_CHANNELS];
+#endif
 
     for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
     {
         p_sepobj[n] = &data_separated_objects[n][0];
     }
 
+#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
     /* Delay the object signals to match the CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
     if ( st_ivas->hSpatParamRendCom->slots_rendered == 0 )
     {
@@ -657,7 +679,7 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm(
             delay_signal( tc_local[n], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
         }
     }
-
+#endif
     ivas_dirac_dec_binaural_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, nchan_transport, output_f );
 
     /* reset combined orientation access index before calling the td renderer */
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c
index 0d6d20e7edc8bbf0128fd6a8ffef223aa86b9ecc..961ef00d3c5147897f35f78adc58c6cabb806337 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions.c
@@ -2161,7 +2161,11 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices(
 
             if ( ivas_format == MASA_ISM_FORMAT )
             {
+#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
+                gainFactor = OMASA_TDREND_MATCHING_GAIN * sqrtf( hDiracDecBin->earlyPartEneCorrection[bin] );
+#else
                 gainFactor = 0.7943f * sqrtf( hDiracDecBin->earlyPartEneCorrection[bin] );
+#endif
             }
             else
             {