diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6efbc33bf419986836ba34ba684831a872dbd03a..0df727291619c4e74d88c2b30e882c7a7ea1ead7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,11 +272,15 @@ stages:
   - cd $SCRIPTS_DIR
   - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
   - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch
+  - git remote set-branches --add origin main # Add main to be able to load new format HRTFs
   - git fetch
   - git restore --staged . # Needed if HRTF model files were updated.
   - git restore . # Just as a precaution
   - git checkout $BASOP_CI_BRANCH_PC_REPO
   - git pull origin $BASOP_CI_BRANCH_PC_REPO
+# Restore new format of HRTF binary
+  - git fetch origin main
+  - git checkout 78154d0b3f1b2c6c8ff8a234f3f7cf865d467d35 -- scripts/binauralRenderer_interface/binaural_renderers_hrtf_data
   - cd -
   - cp -r $SCRIPTS_DIR/ci .
   - cp -r $SCRIPTS_DIR/scripts .
@@ -689,11 +693,11 @@ stages:
     - *check-up-to-date-in-comparison-jobs
 
     - exit_code_target=0
-    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -k "not model" > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
 
     - exit_code=0
     - rm -rf .pytest_cache || true
-    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt || exit_code=$?
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout -k "not model" > pytest_log.txt || exit_code=$?
 
     - if [ $exit_code -ne 0 ]; then
     -   exit_code=$EXIT_CODE_NON_BE
@@ -2210,7 +2214,7 @@ ivas-pytest-on-merge-request:
 
     ### prepare pytest
     # create references
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -k "not model"
 
     ### Run test using branch scripts and input
     - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
@@ -2218,7 +2222,7 @@ ivas-pytest-on-merge-request:
     ### run pytest
     - exit_code=0
     - testcase_timeout=600
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$?
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout -k "not model" || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
     - *merge-request-comparison-check
diff --git a/apps/decoder.c b/apps/decoder.c
index 76bd23bbf7dedb7b1d8bc284ee1837dc9411b099..0ed86b187178773158c1d143f160beb15bbc7e52 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -610,7 +610,6 @@ int main(
         }
 
 #ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
         if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
         {
             if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -619,7 +618,6 @@ int main(
                 goto cleanup;
             }
         }
-#endif
 #endif
         if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
         {
@@ -704,7 +702,6 @@ int main(
             }
         }
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
         if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -723,12 +720,14 @@ int main(
             }
         }
 #else
-        if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
+        if ( ( hHrtfTD != NULL ) && ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
         {
-            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
-            goto cleanup;
+            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
+            {
+                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
+                goto cleanup;
+            }
         }
-#endif
 #endif
     }
 
diff --git a/apps/renderer.c b/apps/renderer.c
index f2beb82c38db39136729b3f2182b411b0f13eb1c..b2e732c6f78307dd5a3bfc1a4f1659632942bc61 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -1012,7 +1012,6 @@ int main(
             }
 
 #ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
             if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
             {
                 if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -1021,7 +1020,6 @@ int main(
                     goto cleanup;
                 }
             }
-#endif
 #endif
 
             if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
@@ -1105,8 +1103,8 @@ int main(
             }
         }
 
+
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
         if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );
@@ -1124,7 +1122,6 @@ int main(
                 destroy_hrtf_statistics( hHrtfStatistics );
             }
         }
-#endif
 #endif
 
         hrtfFileReader_close( &hrtfFileReader );
diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100755
new mode 100644
index 79443ece86b896cefc0f98f9e6585e26c31add97..78a494c61edfc207e72b41383fd0e51d33f33bcb
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -105,19 +105,21 @@
 
 #define FIX_1372_ISAR_POST_REND
 #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
-
-//#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */
-#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
-#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES       /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/
-#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
 #define NONBE_FIX_AVG_IAC_CLDFB_REVERB
 #endif
+
+#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
 #define FIX_OLD_BINARY_FORMAT                           /* Orange: trick to make tests succesful when changing hrtf binary format between ref and new branch*/      
-#define FIX_OLD_BINARY_FILE                             /* Orange: current hrtf binary file in ref branch contains wrong values for fastconv value. This switch can be activated to compre running codec with and without hrtf file*/      
+//#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES			  /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/
+#endif
+
+//#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/
 #define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */
 #define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */
-#endif
+
+
 #define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */
 
 //#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */
diff --git a/lib_dec/ivas_init_dec_fx.c b/lib_dec/ivas_init_dec_fx.c
index f00ea46767ca397a2f8cab00e83a864764572631..926d1f93f3fb7986c1fda22a3b291377dd2eaae8 100644
--- a/lib_dec/ivas_init_dec_fx.c
+++ b/lib_dec/ivas_init_dec_fx.c
@@ -2325,7 +2325,7 @@ ivas_error ivas_init_decoder_fx(
 
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
         IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
-                                                  st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ),
+                                                  st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ),
                    IVAS_ERR_OK ) )
 #else
         IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
diff --git a/lib_rend/ivas_crend_fx.c b/lib_rend/ivas_crend_fx.c
index 369a1d2b4302ba0b542c95696e61c2441e42641b..031926546364fd8cd5b8cbcb09a1a90fc26e2dfb 100644
--- a/lib_rend/ivas_crend_fx.c
+++ b/lib_rend/ivas_crend_fx.c
@@ -2153,8 +2153,10 @@ static ivas_error ivas_rend_crendConvolver(
 
                     FOR( k = 0; k < pCrend->hHrtfCrend->index_frequency_max_diffuse; k++ )
                     {
-                        pFreq_buf_re[k] += pFreq_filt_re[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i];
-                        pFreq_buf_im[k] += pFreq_filt_im[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i];
+                        pFreq_buf_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_re[k] ); // Qx
+                        pFreq_buf_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_im[k] ); // Qx
+                        move32();
+                        move32();
                     }
                 }
                 ELSE
@@ -2168,10 +2170,14 @@ static ivas_error ivas_rend_crendConvolver(
 
                     for ( k = 0; k < pCrend->hHrtfCrend->index_frequency_max_diffuse; k++ )
                     {
-                        pFreq_buf_re[k] += pFreq_filt_re[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i];
-                        pFreq_buf_im[k] += pFreq_filt_im[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i];
-                        pFreq_buf2_re[k] += pFreq_filt_re[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i];
-                        pFreq_buf2_im[k] += pFreq_filt_im[k] * pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i];
+                        pFreq_buf_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_re[k] ); // Qx
+                        pFreq_buf_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_im[k] ); // Qx
+                        move32();
+                        move32();
+                        pFreq_buf2_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i] ), pFreq_buf2_re[k] ); // Qx
+                        pFreq_buf2_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i] ), pFreq_buf2_im[k] ); // Qx
+                        move32();
+                        move32();
                     }
                 }
 #else
diff --git a/lib_rend/ivas_hrtf_fx.c b/lib_rend/ivas_hrtf_fx.c
index 0e535170b4c5c96f2543c80fba3bdcde1b1472dc..845b61cb111113886e012745d8172d5181b5b4b7 100644
--- a/lib_rend/ivas_hrtf_fx.c
+++ b/lib_rend/ivas_hrtf_fx.c
@@ -33,8 +33,10 @@
 #include <stdint.h>
 #include "options.h"
 #include "prot_fx.h"
-#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
+#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
 #include "ivas_rom_binaural_crend_head.h"
+#else
+#include "ivas_rom_rend.h"
 #endif
 #include "ivas_prot_rend_fx.h"
 #include "ivas_error.h"
@@ -297,9 +299,34 @@ ivas_error ivas_HRTF_statistics_init(
             HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_32kHz_fx;
             break;
         case 16000:
+#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
+            HrtfStatistics->average_energy_l_dyn = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC_16KHZ * sizeof( float ) );
+            if ( HrtfStatistics->average_energy_l_dyn == NULL )
+            {
+                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
+            }
+            HrtfStatistics->average_energy_r_dyn = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC_16KHZ * sizeof( float ) );
+            if ( HrtfStatistics->average_energy_r_dyn == NULL )
+            {
+                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
+            }
+            HrtfStatistics->inter_aural_coherence_dyn = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC_16KHZ * sizeof( float ) );
+            if ( HrtfStatistics->inter_aural_coherence_dyn == NULL )
+            {
+                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
+            }
+            floatToFixed_arr32( defaultHRIR_left_avg_power_16kHz_fx, HrtfStatistics->average_energy_l_dyn, Q27, LR_IAC_LENGTH_NR_FC_16KHZ );  /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
+            floatToFixed_arr32( defaultHRIR_right_avg_power_16kHz_fx, HrtfStatistics->average_energy_r_dyn, Q27, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
+            floatToFixed_arr32( defaultHRIR_coherence_16kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, Q27, LR_IAC_LENGTH_NR_FC_16KHZ );  /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
+            HrtfStatistics->average_energy_l = (const Word32 *) HrtfStatistics->average_energy_l_dyn;
+            HrtfStatistics->average_energy_r = (const Word32 *) HrtfStatistics->average_energy_r_dyn;
+            HrtfStatistics->inter_aural_coherence = (const Word32 *) HrtfStatistics->inter_aural_coherence_dyn;
+#else
+
             HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_16kHz_fx;
             HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_16kHz_fx;
             HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_16kHz_fx;
+#endif
             break;
     }
     HrtfStatistics->fromROM = TRUE;
diff --git a/lib_rend/ivas_reverb_fx.c b/lib_rend/ivas_reverb_fx.c
index b5da387084038b1b34ac744da64829670cfa0eae..00513d30e8726b3cdc1d5e587d5bb0406f9fbf1e 100644
--- a/lib_rend/ivas_reverb_fx.c
+++ b/lib_rend/ivas_reverb_fx.c
@@ -1558,10 +1558,28 @@ ivas_error ivas_reverb_open_fx(
     test();
 
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
+    /* set up reverb acoustic data on the basis of HRTF data and renderer config  */
+    Scale_sig32( params.pFc_fx, nr_fc_fft_filter, 2 );
+    Word16 *pRt60_e = (Word16 *) malloc( sizeof( Word16 ) * nr_fc_fft_filter );
+    Word16 *pDsr_e = (Word16 *) malloc( sizeof( Word16 ) * nr_fc_fft_filter );
+
+    params.pRt60_e = pRt60_e;
+    params.pDsr_e = pDsr_e;
+
     set_reverb_acoustic_data_fx( &params, &hRenderConfig->roomAcoustics, nr_fc_input, nr_fc_fft_filter );
+    Scale_sig32( params.pFc_fx, nr_fc_fft_filter, -2 );
+    FOR( i = 0; i < nr_fc_fft_filter; i++ )
+    {
+        params.pRt60_fx[i] = L_abs( params.pRt60_fx[i] );
+        move32();
+        params.pDsr_fx[i] = L_abs( params.pDsr_fx[i] );
+        move32();
+    }
+
     params.pHrtf_avg_pwr_response_l_const_fx = hHrtfStatistics->average_energy_l;
     params.pHrtf_avg_pwr_response_r_const_fx = hHrtfStatistics->average_energy_r;
     params.pHrtf_inter_aural_coherence_const_fx = hHrtfStatistics->inter_aural_coherence;
+
 #else
     IF( hHrtf == NULL && lr_energy_and_iac_fx != NULL )
     {
@@ -2502,16 +2520,18 @@ ivas_error ivas_binaural_reverb_init(
     {
         float t60_temp[CLDFB_NO_CHANNELS_MAX];
         float ene_temp[CLDFB_NO_CHANNELS_MAX];
+
+        revTimes = t60;
+        revEne = ene;
+
         if ( ( error = ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfStatistics, sampling_rate, t60_temp, ene_temp ) ) != IVAS_ERR_OK )
         {
             return error;
         }
-        floatToFixed_arrL32( t60_temp, t60, Q15, CLDFB_NO_CHANNELS_MAX );
-        floatToFixed_arrL32( ene_temp, ene, Q15, CLDFB_NO_CHANNELS_MAX );
-        revTimes = t60;
-        revEne = ene;
 
         preDelay = (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX );
+        floatToFixed_arrL( t60_temp, t60, Q31, CLDFB_NO_CHANNELS_MAX );
+        floatToFixed_arrL( ene_temp, ene, Q31, CLDFB_NO_CHANNELS_MAX );
     }
     else
     {
diff --git a/lib_rend/ivas_reverb_utils_fx.c b/lib_rend/ivas_reverb_utils_fx.c
index 75cc4b816d5570970a89f7d7d4fa13855f310146..f673fdc7d4d829900f68362a1a2b8581571acd01 100644
--- a/lib_rend/ivas_reverb_utils_fx.c
+++ b/lib_rend/ivas_reverb_utils_fx.c
@@ -96,7 +96,6 @@ ivas_error ivas_reverb_prepare_cldfb_params(
 #endif
 {
     int16_t idx;
-    float fc[CLDFB_NO_CHANNELS_MAX];
     float avg_pwr_left[CLDFB_NO_CHANNELS_MAX];
     float avg_pwr_right[CLDFB_NO_CHANNELS_MAX];
     float delay_diff, ln_1e6_inverted, exp_argument;
@@ -105,40 +104,31 @@ ivas_error ivas_reverb_prepare_cldfb_params(
 #ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
     ivas_error error;
 #endif
-
-    for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ )
-    {
-        fc[idx] = ( idx + 0.5f ) * ( MAX_SAMPLING_RATE / ( 2 * CLDFB_NO_CHANNELS_MAX ) );
-    }
-    Word32 *fc_fx = (Word32 *) malloc( pInput_params->nBands * sizeof( Word32 * ) );
-    Word32 *pOutput_t60_fx = (Word32 *) malloc( pInput_params->nBands * sizeof( Word32 * ) );
-    Word16 *pOutput_t60_e = (Word16 *) malloc( pInput_params->nBands * sizeof( Word16 * ) );
-    Word32 *pOutput_ene_fx = (Word32 *) malloc( pInput_params->nBands * sizeof( Word32 * ) );
-    Word16 *pOutput_ene_e = (Word16 *) malloc( pInput_params->nBands * sizeof( Word16 * ) );
+    Word32 output_fc_fx[CLDFB_NO_CHANNELS_MAX];
+    Word32 output_t60_fx[CLDFB_NO_CHANNELS_MAX];
+    Word16 output_t60_e[CLDFB_NO_CHANNELS_MAX];
+    Word32 output_ene_fx[CLDFB_NO_CHANNELS_MAX];
+    Word16 output_ene_e[CLDFB_NO_CHANNELS_MAX];
     Word32 delay_diff_fx;
 
-    for ( int i = 0; i < pInput_params->nBands; i++ )
+    for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ )
     {
-        fc_fx[i] = (Word32) fc[i] * ONE_IN_Q16;
+        output_fc_fx[idx] = (Word32) ( ( idx + 0.5f ) * ( MAX_SAMPLING_RATE / ( 2 * CLDFB_NO_CHANNELS_MAX ) ) ) * ONE_IN_Q16;
     }
 
     ivas_reverb_interpolate_acoustic_data_fx( pInput_params->nBands, pInput_params->pFc_input_fx, pInput_params->pAcoustic_rt60_fx, pInput_params->pAcoustic_dsr_fx,
-                                              CLDFB_NO_CHANNELS_MAX, fc_fx, pOutput_t60_fx, pOutput_ene_fx, pOutput_t60_e, pOutput_ene_e );
+                                              CLDFB_NO_CHANNELS_MAX, output_fc_fx, output_t60_fx, output_ene_fx, output_t60_e, output_ene_e );
 
     /* adjust DSR for the delay difference */
     delay_diff_fx = L_sub( pInput_params->inputPreDelay_fx, pInput_params->acousticPreDelay_fx );
 
     delay_diff = (float) delay_diff_fx / ONE_IN_Q27;
-    for ( int i = 0; i < pInput_params->nBands; i++ )
+    for ( int i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
     {
-        pOutput_t60[i] = (float) fabs( me2f( pOutput_t60_fx[i], pOutput_t60_e[i] ) );
-        pOutput_ene[i] = (float) fabs( me2f( pOutput_ene_fx[i], pOutput_ene_e[i] ) );
+        pOutput_t60[i] = (float) fabs( me2f( output_t60_fx[i], output_t60_e[i] ) );
+        pOutput_ene[i] = (float) fabs( me2f( output_ene_fx[i], output_ene_e[i] ) );
     }
-    free( fc_fx );
-    free( pOutput_t60_fx );
-    free( pOutput_t60_e );
-    free( pOutput_ene_fx );
-    free( pOutput_ene_e );
+
     ln_1e6_inverted = 1.0f / logf( 1e06f );
     for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ )
     {
@@ -336,13 +326,13 @@ static ivas_error ivas_reverb_get_fastconv_hrtf_set_energies(
 
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
 
-    Word32 *input_fc_fx = (Word32 *) malloc( 60 * sizeof( Word32 * ) );
+    Word32 *input_fc_fx = (Word32 *) malloc( 60 * sizeof( Word32 ) );
 
-    Word32 *output_fc_fx = (Word32 *) malloc( 257 * sizeof( Word32 * ) );
-    Word16 *avg_pwr_left_e = (Word16 *) malloc( 257 * sizeof( Word16 * ) );
-    Word16 *avg_pwr_right_e = (Word16 *) malloc( 257 * sizeof( Word16 * ) );
-    Word32 *avg_pwr_left_fx = (Word32 *) malloc( 257 * sizeof( Word32 * ) );
-    Word32 *avg_pwr_right_fx = (Word32 *) malloc( 257 * sizeof( Word32 * ) );
+    Word32 *output_fc_fx = (Word32 *) malloc( 257 * sizeof( Word32 ) );
+    Word16 *avg_pwr_left_e = (Word16 *) malloc( 257 * sizeof( Word16 ) );
+    Word16 *avg_pwr_right_e = (Word16 *) malloc( 257 * sizeof( Word16 ) );
+    Word32 *avg_pwr_left_fx = (Word32 *) malloc( 257 * sizeof( Word32 ) );
+    Word32 *avg_pwr_right_fx = (Word32 *) malloc( 257 * sizeof( Word32 ) );
 
     for ( int i = 0; i < 60; i++ )
     {
@@ -357,7 +347,7 @@ static ivas_error ivas_reverb_get_fastconv_hrtf_set_energies(
     ivas_reverb_interpolate_acoustic_data_fx( FFT_SPECTRUM_SIZE, input_fc_fx, avg_pwr_l, avg_pwr_r,
                                               CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_left_fx, avg_pwr_right_fx, avg_pwr_left_e, avg_pwr_right_e );
 
-    for ( int i = 0; i < 257; i++ )
+    for ( int i = 0; i < 60; i++ )
     {
         avg_pwr_left[i] = (float) fabs( me2f( avg_pwr_left_fx[i], avg_pwr_left_e[i] ) );
         avg_pwr_right[i] = (float) fabs( me2f( avg_pwr_right_fx[i], avg_pwr_right_e[i] ) );
@@ -368,7 +358,7 @@ static ivas_error ivas_reverb_get_fastconv_hrtf_set_energies(
     free( avg_pwr_left_e );
     free( avg_pwr_right_e );
     free( avg_pwr_left_fx );
-    free( avg_pwr_left_fx );
+    free( avg_pwr_right_fx );
 
 #else
     if ( ( error = ivas_reverb_get_cldfb_hrtf_set_properties( input_audio_config, hHrtfFastConv, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft ) ) != IVAS_ERR_OK )
diff --git a/lib_rend/ivas_rom_binaural_crend_head.h b/lib_rend/ivas_rom_binaural_crend_head.h
index 9e40c49ba23eeebac208911d9393b0e56678892a..183a025a8a4dd18ea889d9533d68d0680e2c1960 100644
--- a/lib_rend/ivas_rom_binaural_crend_head.h
+++ b/lib_rend/ivas_rom_binaural_crend_head.h
@@ -358,9 +358,9 @@ extern const Word32 defaultHRIR_left_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC];  /
 extern const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC]; /*Q-23*/
 
 #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
-extern  Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];       /*Q-27*/
-extern  Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];  /*Q-23*/
-extern  Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ]; /*Q-23*/
+extern   float defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];       /*Q-27*/
+extern   float defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];  /*Q-23*/
+extern   float defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ]; /*Q-23*/
 #else
 extern const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC];       /*Q-27*/
 extern const Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC];  /*Q-23*/
diff --git a/lib_rend/ivas_rom_binaural_crend_head_fx.c b/lib_rend/ivas_rom_binaural_crend_head_fx.c
index 71a98fb0ef71988424409e3b0053af90cc2fa0e5..b4ebfe6e530503ecc7b974137313bdf348a3371b 100644
--- a/lib_rend/ivas_rom_binaural_crend_head_fx.c
+++ b/lib_rend/ivas_rom_binaural_crend_head_fx.c
@@ -59838,7 +59838,7 @@ const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-23*/
     2790378,2355663,2029237,1865240,1832432
 };
 
-#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
+#ifndef NONBE_FIX_AVG_IAC_CLDFB_REVERB
 
 const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-27*/ = {
     130123416,130123416,128225040,123478832,118732624,113118568,104033232,94947768,85862304,
diff --git a/lib_rend/ivas_rom_rend.h b/lib_rend/ivas_rom_rend.h
index f4aecc8378d072127134521ac4571407bd523c46..7cbe760510f7271552321a7fec8fc9031804e935 100644
--- a/lib_rend/ivas_rom_rend.h
+++ b/lib_rend/ivas_rom_rend.h
@@ -103,9 +103,9 @@ extern const Word32 defaultHRIR_left_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC];  /
 extern const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC]; /*Q-23*/
 
 #ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
-extern const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];       /*Q-27*/
-extern const Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];  /*Q-23*/
-extern const Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ]; /*Q-23*/
+extern float defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];       /*Q-27*/
+extern float defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ];  /*Q-23*/
+extern float defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ]; /*Q-23*/
 #else
 extern const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC];       /*Q-27*/
 extern const Word32 defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC];  /*Q-23*/
diff --git a/lib_rend/ivas_rom_rend_fx.c b/lib_rend/ivas_rom_rend_fx.c
index 75bd017565775a1e6d88011477457931dc04eebd..5247b8e771e5f51419411893c6d68843dce23871 100644
--- a/lib_rend/ivas_rom_rend_fx.c
+++ b/lib_rend/ivas_rom_rend_fx.c
@@ -393,6 +393,64 @@ const Word32 defaultHRIR_right_avg_power_32kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-23*/
     5411340,5510149,5612037,5649820,5591435,5269472,4824498,4151094,3472472,
     2790378,2355663,2029237,1865240,1832432
 };
+
+#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
+/* Sample Rate = 16000 */
+
+ float defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ] = 
+        {0.983044f, 0.960794f, 0.893756f, 0.783586f, 0.638963f, 0.477338f, 0.319879f, 0.183374f, 0.075909f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.003842f, 0.025288f, 0.035886f, 
+        0.037785f, 0.035991f, 0.034784f, 0.035091f, 0.034683f, 0.030849f, 0.023146f, 0.014061f, 0.007275f, 
+        0.005053f, 0.006930f, 0.010589f, 0.013905f, 0.016288f, 0.018404f, 0.020849f, 0.023164f, 0.024149f, 
+        0.023098f, 0.020635f, 0.018325f, 0.017381f, 0.017611f, 0.017534f, 0.015650f, 0.011786f, 0.007342f, 
+        0.004290f, 0.003732f, 0.005148f, 0.006838f, 0.007172f, 0.005579f, 0.002632f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000238f, 0.001738f, 0.003011f, 0.003910f, 
+        0.004120f, 0.003394f, 0.001769f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 
+        0.000000f, 0.002101f, 0.004247f, 0.006330f, 0.008300f, 0.010110f, 0.011735f, 0.013165f, 0.014384f, 
+        0.015345f, 0.015972f, 0.016191f};
+
+ float defaultHRIR_left_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ] = 
+        {1.118974f, 1.115256f, 1.106210f, 1.096901f, 1.092316f, 1.094422f, 1.101140f, 1.107775f, 1.110000f, 
+        1.106535f, 1.099921f, 1.094914f, 1.095643f, 1.103178f, 1.114955f, 1.126292f, 1.132973f, 1.133288f, 
+        1.128471f, 1.121439f, 1.114842f, 1.109721f, 1.105480f, 1.100966f, 1.095650f, 1.090074f, 1.085225f, 
+        1.081525f, 1.078267f, 1.074026f, 1.067777f, 1.059839f, 1.051856f, 1.045772f, 1.042531f, 1.041432f, 
+        1.040607f, 1.038291f, 1.033910f, 1.028286f, 1.022846f, 1.018514f, 1.015152f, 1.011898f, 1.008047f, 
+        1.003762f, 0.999992f, 0.997770f, 0.997349f, 0.997960f, 0.998259f, 0.997177f, 0.994506f, 0.990883f, 
+        0.987207f, 0.984003f, 0.981133f, 0.977984f, 0.973950f, 0.968837f, 0.962915f, 0.956690f, 0.950584f, 
+        0.944679f, 0.938744f, 0.932399f, 0.925372f, 0.917663f, 0.909568f, 0.901511f, 0.893804f, 0.886455f, 
+        0.879155f, 0.871463f, 0.863142f, 0.854285f, 0.845334f, 0.836740f, 0.828656f, 0.820817f, 0.812713f, 
+        0.803960f, 0.794564f, 0.784952f, 0.775633f, 0.766881f, 0.758539f, 0.750156f, 0.741330f, 0.732004f, 
+        0.722524f, 0.713387f, 0.704919f, 0.697057f, 0.689419f, 0.681576f, 0.673350f, 0.664931f, 0.656703f, 
+        0.648997f, 0.641801f, 0.634760f, 0.627357f, 0.619192f, 0.610186f, 0.600526f, 0.590442f, 0.579952f, 
+        0.568762f, 0.556384f, 0.542389f, 0.526648f, 0.509355f, 0.490884f, 0.471542f, 0.451447f, 0.430550f, 
+        0.408842f, 0.386537f, 0.364126f, 0.342284f, 0.321675f, 0.302809f, 0.286016f, 0.271536f, 0.259639f, 
+        0.250691f, 0.245099f, 0.243192f};
+
+ float defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC_16KHZ] = 
+        {1.118974f, 1.115254f, 1.106207f, 1.096903f, 1.092317f, 1.094425f, 1.101145f, 1.107775f, 1.109999f, 
+        1.106540f, 1.099921f, 1.094912f, 1.095644f, 1.103178f, 1.114952f, 1.126292f, 1.132973f, 1.133288f, 
+        1.128472f, 1.121439f, 1.114842f, 1.109719f, 1.105481f, 1.100965f, 1.095650f, 1.090072f, 1.085224f, 
+        1.081527f, 1.078270f, 1.074025f, 1.067775f, 1.059840f, 1.051856f, 1.045772f, 1.042533f, 1.041433f, 
+        1.040611f, 1.038292f, 1.033911f, 1.028286f, 1.022844f, 1.018512f, 1.015153f, 1.011899f, 1.008050f, 
+        1.003762f, 0.999995f, 0.997769f, 0.997349f, 0.997959f, 0.998259f, 0.997178f, 0.994509f, 0.990883f, 
+        0.987204f, 0.984003f, 0.981133f, 0.977983f, 0.973949f, 0.968836f, 0.962914f, 0.956689f, 0.950583f, 
+        0.944681f, 0.938745f, 0.932399f, 0.925373f, 0.917662f, 0.909567f, 0.901511f, 0.893804f, 0.886456f, 
+        0.879153f, 0.871467f, 0.863138f, 0.854286f, 0.845334f, 0.836740f, 0.828656f, 0.820816f, 0.812712f, 
+        0.803961f, 0.794567f, 0.784951f, 0.775631f, 0.766882f, 0.758540f, 0.750158f, 0.741330f, 0.732005f, 
+        0.722523f, 0.713388f, 0.704920f, 0.697057f, 0.689418f, 0.681575f, 0.673352f, 0.664930f, 0.656706f, 
+        0.648998f, 0.641802f, 0.634762f, 0.627355f, 0.619192f, 0.610187f, 0.600527f, 0.590442f, 0.579953f, 
+        0.568763f, 0.556383f, 0.542389f, 0.526646f, 0.509355f, 0.490883f, 0.471543f, 0.451446f, 0.430550f, 
+        0.408843f, 0.386537f, 0.364127f, 0.342285f, 0.321676f, 0.302809f, 0.286016f, 0.271535f, 0.259640f, 
+        0.250692f, 0.245099f, 0.243192f};
+
+
+#else
+
 const Word32 defaultHRIR_coherence_16kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-27*/ = {
     130123416,130123416,128225040,123478832,118732624,113118568,104033232,94947768,85862304,
     75063144,64263984,53464828,43914296,34675820,25437480,17993766,11746601,5499437,
@@ -487,6 +545,7 @@ const Word32 defaultHRIR_right_avg_power_16kHz_fx[LR_IAC_LENGTH_NR_FC] /*Q-23*/
     1708239,1437966,1167685,1059573,1059573
 };
 #endif
+#endif
 /*----------------------------------------------------------------------------------*
  * t-design and SN3D normalization table
  *----------------------------------------------------------------------------------*/
diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c
index 5832296c862c0cf2d41f790c63c9cdf3a0d4c9b2..c6d1d48ec938291cfe7542effce09b54f3b9ccfc 100644
--- a/lib_util/hrtf_file_reader.c
+++ b/lib_util/hrtf_file_reader.c
@@ -37,6 +37,8 @@
 #include "ivas_prot_fx.h"
 #ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
 #include "ivas_rom_binaural_crend_head.h"
+#else
+#include "ivas_rom_rend.h"
 #endif
 
 /*---------------------------------------------------------------------*
@@ -193,7 +195,7 @@ static ivas_error check_hrtf_binary_header(
 {
     /* Check the renderer type */
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     if ( ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_MIXER_CONV ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&
          ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_FASTCONV ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) &&
          ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM ) &&
@@ -363,7 +365,7 @@ static ivas_error LoadBSplineBinary(
 
     float f_tmp_latency_s;
 
-#ifndef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifndef USE_NEW_HRTF_BINARY_FILE_FORMAT
     float f_tmp_lr_energy_and_iac_dyn[LR_IAC_LENGTH_NR_FC];
 #endif
 
@@ -551,7 +553,7 @@ static ivas_error LoadBSplineBinary(
         LoadBSplineBinaryITD( &HrFiltSet_p->ModelParamsITD, f_hrtf );
     }
 
-#ifndef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifndef USE_NEW_HRTF_BINARY_FILE_FORMAT
     /* left/right energy and interaural coherence for late reverb */
     FOR( i = 0; i < 3; i++ )
     {
@@ -576,7 +578,6 @@ static ivas_error LoadBSplineBinary(
     return IVAS_ERR_OK;
 }
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
 #ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
 /*-------------------------------------------------------------------*
  * set_default_reverb_iac_energy()
@@ -615,12 +616,10 @@ static ivas_error set_default_reverb_iac_energy(
 #else
             HrFiltSet_p->lr_energy_and_iac_dyn[i] = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC * sizeof( float ) );
 #endif
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
             if ( HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] == NULL )
             {
                 return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
             }
-#endif
         }
         switch ( HrFiltSet_p->SampleRate )
         {
@@ -692,8 +691,6 @@ static ivas_error set_default_reverb_iac_energy(
 }
 #endif
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
-
 /*-------------------------------------------------------------------*
  * load_reverb_from_binary()
  *
@@ -720,11 +717,8 @@ static ivas_error load_reverb_from_binary(
     ivas_hrtfs_header_t hrtf_header;
     int32_t hrtf_data_size_max;
     char *hrtf_data;
-#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
     int16_t lr_iac_len;
-#ifndef FIX_638_ENERGIE_IAC_ROM_TABLES
     float f_tmp_lr_energy_and_iac_dyn[LR_IAC_LENGTH_NR_FC];
-#endif
 
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
     if ( hHrtfStatistics == NULL )
@@ -736,6 +730,7 @@ static ivas_error load_reverb_from_binary(
     }
 
     lr_iac_len = LR_IAC_LENGTH_NR_FC;
+#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
     if ( sampleRate == 16000 )
 #else
@@ -783,7 +778,11 @@ static ivas_error load_reverb_from_binary(
             return header_check_result;
         }
 
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
         is_reverb = ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_REVERB_ALL );
+#else
+        is_reverb = ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_REVERB_ALL );
+#endif
         if ( !is_reverb )
         {
             if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size )
@@ -802,9 +801,8 @@ static ivas_error load_reverb_from_binary(
         hHrtfStatistics->average_energy_l_dyn = (Word32 *) malloc( lr_iac_len * sizeof( Word32 ) );
         hHrtfStatistics->average_energy_r_dyn = (Word32 *) malloc( lr_iac_len * sizeof( Word32 ) );
         hHrtfStatistics->inter_aural_coherence_dyn = (Word32 *) malloc( lr_iac_len * sizeof( Word32 ) );
-        float *hrtf_prop_local = (float *) malloc( lr_iac_len * sizeof( float ) );
 
-        if ( hHrtfStatistics->average_energy_l_dyn == NULL || hHrtfStatistics->average_energy_r_dyn == NULL || hHrtfStatistics->inter_aural_coherence_dyn == NULL || hrtf_prop_local == NULL )
+        if ( hHrtfStatistics->average_energy_l_dyn == NULL || hHrtfStatistics->average_energy_r_dyn == NULL || hHrtfStatistics->inter_aural_coherence_dyn == NULL )
         {
             return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
         }
@@ -812,23 +810,21 @@ static ivas_error load_reverb_from_binary(
         hHrtfStatistics->average_energy_r = hHrtfStatistics->average_energy_r_dyn;
         hHrtfStatistics->inter_aural_coherence = hHrtfStatistics->inter_aural_coherence_dyn;
 
-        fread( hrtf_prop_local, sizeof( float ), lr_iac_len, f_hrtf );
-        floatToFixed_arr32( hrtf_prop_local, hHrtfStatistics->average_energy_l_dyn, Q27, lr_iac_len );
+        fread( f_tmp_lr_energy_and_iac_dyn, sizeof( float ), lr_iac_len, f_hrtf );
+        floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, hHrtfStatistics->average_energy_l_dyn, Q27, lr_iac_len );
 
-        fread( hrtf_prop_local, sizeof( float ), lr_iac_len, f_hrtf );
-        floatToFixed_arr32( hrtf_prop_local, hHrtfStatistics->average_energy_r_dyn, Q27, lr_iac_len );
+        fread( f_tmp_lr_energy_and_iac_dyn, sizeof( float ), lr_iac_len, f_hrtf );
+        floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, hHrtfStatistics->average_energy_r_dyn, Q27, lr_iac_len );
 
-        fread( hrtf_prop_local, sizeof( float ), lr_iac_len, f_hrtf );
-        floatToFixed_arr32( hrtf_prop_local, hHrtfStatistics->inter_aural_coherence_dyn, Q23, lr_iac_len );
+        fread( f_tmp_lr_energy_and_iac_dyn, sizeof( float ), lr_iac_len, f_hrtf );
+        floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, hHrtfStatistics->inter_aural_coherence_dyn, Q23, lr_iac_len );
 
         hHrtfStatistics->fromROM = FALSE;
-        free( hrtf_prop_local );
 #else
         /* left/right energy and interaural coherence for late reverb */
         FOR( i = 0; i < 3; i++ )
         {
-#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
-            HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] = (Word32 *) malloc( lr_iac_len * sizeof( Word32 ) );
+            HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] = (Word32 *) malloc( lr_iac_len * sizeof( float ) );
             if ( HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] == NULL )
             {
                 return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
@@ -843,23 +839,6 @@ static ivas_error load_reverb_from_binary(
                 floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, HrFiltSet_p->lr_energy_and_iac_dyn_fx[i], Q23, lr_iac_len ); /* tables from which lr_energy_and_iac is updated has Q23 for i=0,1 */
             }
             HrFiltSet_p->lr_energy_and_iac_fx[i] = (const Word32 *) HrFiltSet_p->lr_energy_and_iac_dyn_fx[i];
-#else
-            HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] = (Word32 *) malloc( LR_IAC_LENGTH_NR_FC_16KHZ * sizeof( Word32 ) );
-            if ( HrFiltSet_p->lr_energy_and_iac_dyn_fx[i] == NULL )
-            {
-                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
-            }
-            fread( f_tmp_lr_energy_and_iac_dyn, sizeof( const float ), LR_IAC_LENGTH_NR_FC_16KHZ, f_hrtf );
-            IF( i == 2 )
-            {
-                floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, HrFiltSet_p->lr_energy_and_iac_dyn_fx[i], Q27, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-            }
-            ELSE
-            {
-                floatToFixed_arr32( f_tmp_lr_energy_and_iac_dyn, HrFiltSet_p->lr_energy_and_iac_dyn_fx[i], Q23, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q23 for i=0,1 */
-            }
-            HrFiltSet_p->lr_energy_and_iac_fx[i] = (const Word32 *) HrFiltSet_p->lr_energy_and_iac_dyn_fx[i];
-#endif
         }
 #endif
     }
@@ -877,7 +856,6 @@ static ivas_error load_reverb_from_binary(
 
     return IVAS_ERR_OK;
 }
-#endif
 
 /*---------------------------------------------------------------------*
  * load_reverb_binary()
@@ -903,7 +881,6 @@ ivas_error load_reverb_binary(
     return load_reverb_from_binary( hHrtf, hrtfReader->file );
 #endif
 }
-#endif
 /*-------------------------------------------------------------------*
  * TDREND_MIX_LoadHRTF()
  *
@@ -978,7 +955,7 @@ static ivas_error TDREND_MIX_LoadHRTF(
             return header_check_result;
         }
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
         is_tdrend = ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD );
 #else
         is_tdrend = ( hrtf_header.rend_type == RENDERER_BINAURAL_OBJECTS_TD );
@@ -1310,13 +1287,14 @@ static ivas_error create_HRTF_from_rawdata(
     hrtf_data_rptr += sizeof( UWord16 );
 
     /* inv_diffuse_weight */
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
 #ifdef FIX_INV_DIFFUSE_WEIGHT
-    FOR( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
+    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
     {
         ( *hHRTF )->inv_diffuse_weight_fx[0][i] = (Word16) ( *( (float *) ( hrtf_data_rptr ) ) * ONE_IN_Q15 );
         hrtf_data_rptr += sizeof( float );
     }
-    FOR( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
+    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
     {
         ( *hHRTF )->inv_diffuse_weight_fx[1][i] = (Word16) ( *( (float *) ( hrtf_data_rptr ) ) * ONE_IN_Q15 );
         hrtf_data_rptr += sizeof( float );
@@ -1324,11 +1302,30 @@ static ivas_error create_HRTF_from_rawdata(
 #else
     for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
     {
-        //( *hHRTF )->inv_diffuse_weight[i] = *( (float *) ( hrtf_data_rptr ) );
         ( *hHRTF )->inv_diffuse_weight_fx[i] = (Word16) ( *( (float *) ( hrtf_data_rptr ) ) * ONE_IN_Q15 );
         hrtf_data_rptr += sizeof( float );
     }
+    hrtf_data_rptr += sizeof( float ) * ( *hHRTF )->max_num_ir;
+#endif
+#else
+#ifdef FIX_INV_DIFFUSE_WEIGHT
+    /* inv_diffuse_weight */
+    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
+    {
+        ( *hHRTF )->inv_diffuse_weight_fx[0][i] = (Word16) ( *( (float *) ( hrtf_data_rptr ) ) * ONE_IN_Q15 );
+        ( *hHRTF )->inv_diffuse_weight_fx[1][i] = ( *hHRTF )->inv_diffuse_weight[0][i];
+        hrtf_data_rptr += sizeof( float );
+    }
+#else
+    /* inv_diffuse_weight */
+    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
+    {
+        ( *hHRTF )->inv_diffuse_weight[i] = (Word16) ( *( (float *) ( hrtf_data_rptr ) ) * ONE_IN_Q15 );
+        hrtf_data_rptr += sizeof( float );
+    }
+#endif
 #endif
+
     /* max_total_num_fsamp_per_iteration */
     max_total_num_fsamp_per_iteration = *( (UWord16 *) ( hrtf_data_rptr ) );
     hrtf_data_rptr += sizeof( UWord16 );
@@ -1472,7 +1469,7 @@ static ivas_error create_HRTF_from_rawdata(
 static ivas_error create_fastconv_HRTF_from_rawdata(
     HRTFS_FASTCONV_HANDLE *hHRTF, /* i/o: HRTF FastConv handle    */
     char *hrtf_data,              /* i  : pointer to binary file  */
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     HRTF_READER_RENDERER_TYPE rend_type, /* i  : Renderer type           */
 #else
     RENDERER_TYPE rend_type, /* i  : Renderer type           */
@@ -1486,13 +1483,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
     float f_tmp_ntaps_max[BINAURAL_NTAPS_MAX];
     float f_tmp_brir_reverb[CLDFB_NO_CHANNELS_MAX];
     char *hrtf_data_rptr;
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     ivas_error error;
 #endif
 
     ( *hHRTF )->allocate_init_flag = 0;
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV )
     {
         if ( ( error = ivas_allocate_binaural_hrtf_fx( *hHRTF, 0, input_cfg, RENDERER_BINAURAL_FASTCONV, ( *hHRTF )->allocate_init_flag ) ) != IVAS_ERR_OK )
@@ -1527,7 +1524,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
 #endif
 
 /* HRIR */
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
 #else
     if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
@@ -1593,7 +1590,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
             }
         }
     }
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     else if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 )
 #else
     else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 )
@@ -1660,7 +1657,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
             }
         }
     }
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     else if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 )
 #else
     else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 )
@@ -1728,7 +1725,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
             }
         }
     }
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     else if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA )
 #else
     else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA )
@@ -1797,7 +1794,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
         }
     }
 /* BRIR */
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
     else if ( rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
 #else
     else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
@@ -1871,25 +1868,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata(
         }
         hrtf_data_rptr += sizeof( uint16_t );
 
-
-#ifdef FIX_OLD_BINARY_FILE // old binary file is wrong
-        extern const Word32 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX];
-        memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
-        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );
-        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );
-
-        memcpy( f_tmp_brir_reverb, fastconvReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
-        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );
-        floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );
-#else
         memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
         hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );
         floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationTimes_fx, Q31, CLDFB_NO_CHANNELS_MAX );
 
         memcpy( f_tmp_brir_reverb, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
-        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );
         floatToFixed_arrL( f_tmp_brir_reverb, ( *hHRTF )->fastconvReverberationEneCorrections_fx, Q31, CLDFB_NO_CHANNELS_MAX );
-#endif
+        hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float );
     }
 
     return IVAS_ERR_OK;
@@ -1945,7 +1930,7 @@ ivas_error load_fastconv_HRTF_from_binary(
             free( hrtf_data );
             return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" );
         }
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
         if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV ) || ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) )
 #else
         if ( ( hrtf_header.rend_type == RENDERER_BINAURAL_FASTCONV ) || ( hrtf_header.rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) )
@@ -2119,7 +2104,7 @@ ivas_error load_parambin_HRTF_from_binary(
         }
 
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
         if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Parametric binauralizer data is represented as single entity */
 #else
         if ( hrtf_header.rend_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Parametric binauralizer data is represented as single entity */
@@ -2213,7 +2198,7 @@ ivas_error create_SetOfHRTF_from_binary(
         hHRTF = NULL;
         if ( hrtf_header.frequency == output_Fs )
         {
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
             if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV )
 #else
             if ( hrtf_header.rend_type == RENDERER_BINAURAL_MIXER_CONV )
@@ -2236,7 +2221,7 @@ ivas_error create_SetOfHRTF_from_binary(
                     hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_foa );
                 }
             }
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
+#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT
             else if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM )
 #else
             else if ( hrtf_header.rend_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
@@ -2374,6 +2359,7 @@ void destroy_SetOfHRTF(
     return;
 }
 
+
 #ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
 /*---------------------------------------------------------------------*
  * destroy_hrtf_statistics()
@@ -2385,17 +2371,21 @@ void destroy_hrtf_statistics(
     IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics /* i/o: HRTF statistics handle  */
 )
 {
+#ifdef NONBE_FIX_AVG_IAC_CLDFB_REVERB
+    if ( ( hHrtfStatistics != NULL ) && ( *hHrtfStatistics != NULL ) )
+#else
     if ( ( hHrtfStatistics != NULL ) && ( *hHrtfStatistics != NULL ) && ( ( *hHrtfStatistics )->fromROM == FALSE ) )
+#endif
     {
-        if ( ( *hHrtfStatistics )->average_energy_l != NULL )
+        if ( ( *hHrtfStatistics )->average_energy_l_dyn != NULL )
         {
             free( ( *hHrtfStatistics )->average_energy_l_dyn );
         }
-        if ( ( *hHrtfStatistics )->average_energy_r != NULL )
+        if ( ( *hHrtfStatistics )->average_energy_r_dyn != NULL )
         {
             free( ( *hHrtfStatistics )->average_energy_r_dyn );
         }
-        if ( ( *hHrtfStatistics )->inter_aural_coherence != NULL )
+        if ( ( *hHrtfStatistics )->inter_aural_coherence_dyn != NULL )
         {
             free( ( *hHrtfStatistics )->inter_aural_coherence_dyn );
         }
@@ -2404,7 +2394,6 @@ void destroy_hrtf_statistics(
 }
 #endif
 
-
 /*---------------------------------------------------------------------*
  * destroy_fastconv_hrtf()
  *
diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h
index 14ac33e9dd0eeefb1d8738bba1e8365ea8edf754..ca8e8b135484c986bcac727fa235414a9f7b00db 100644
--- a/lib_util/hrtf_file_reader.h
+++ b/lib_util/hrtf_file_reader.h
@@ -47,7 +47,6 @@ typedef struct ivas_hrtfs_header_t
 
 } ivas_hrtfs_header_t;
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
 typedef enum
 {
     HRTF_READER_RENDERER_BINAURAL_INVALID,
@@ -60,7 +59,6 @@ typedef enum
     HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,
     HRTF_READER_RENDERER_BINAURAL_REVERB_ALL
 } HRTF_READER_RENDERER_TYPE;
-#endif
 
 /*---------------------------------------------------------------------*
  * hrtfFileReader_open()
@@ -94,7 +92,6 @@ ivas_error load_HRTF_binary(
     const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle    */
 );
 
-#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
 /*---------------------------------------------------------------------*
  * load_reverb_binary()
  *
@@ -110,7 +107,6 @@ ivas_error load_reverb_binary(
 #endif
     const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle    */
 );
-#endif
 
 /*---------------------------------------------------------------------*
  * create_SetOfHRTF_from_binary()