diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 39b6233c5ac16aebc8f1ff81314502d0f9b563cc..ccf76c486e54527518cc2288c4d749a493696355 100644
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -919,10 +919,16 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
 
 /*! r: render granularity */
 int16_t ivas_jbm_dec_get_render_granularity(
+#ifdef NONBE_1303_REND_GRANULARITY
+    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                               */
+    const RENDERER_TYPE renderer_type_sec,                      /* i  : secondary renderer type                                     */
+    const int32_t output_Fs                                     /* i  : sampling rate                                               */
+#else
     const RENDERER_TYPE rendererType, /* i  : renderer type     */
     const IVAS_FORMAT ivas_format,    /* i  : ivas format */
     const MC_MODE mc_mode,            /* i  : MC mode */
     const int32_t output_Fs           /* i  : sampling rate     */
+    #endif
 );
 
 ivas_error ivas_jbm_dec_tc_buffer_open(
diff --git a/lib_com/options.h b/lib_com/options.h
index fef0f77d3a1d6b03495320e88da9a6f9e3b50bea..e0ea8d1afdca62cff2053f9a588216ac99b8e9d0 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -213,6 +213,7 @@
 #define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */
 #define NONBE_FIX_1297_SPAR_JBM_MEM_SAN                 /* Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer */ 
 #define NONBE_1303_GRANULARITY_OSBA_REND                /* VA: issue 1303: Correctly set the granularity in OSBA, Disc mode, and BINAURAL_ROOM_REVERB output */
+#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */
 
 // object-editing feature porting
 #define OBJ_EDITING_API                                 /* object editing changes related to the API */
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index a71ca31c625234b0f5e933eb485a2de87c93df35..eaba0ed3ab8095342dd3154de8e6b7fc07691f1f 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2213,7 +2213,7 @@ ivas_error ivas_init_decoder(
                 return error;
             }
         }
-
+#ifndef NONBE_1303_REND_GRANULARITY
         granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
         n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
 
@@ -2221,6 +2221,7 @@ ivas_error ivas_init_decoder(
         {
             return error;
         }
+#endif
     }
     else if ( st_ivas->renderer_type == RENDERER_MC )
     {
@@ -2257,7 +2258,7 @@ ivas_error ivas_init_decoder(
         }
 
         st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
-
+#ifndef NONBE_1303_REND_GRANULARITY
         if ( ( st_ivas->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )
         {
             granularity = NS2SA( output_Fs, CLDFB_SLOT_NS );
@@ -2280,6 +2281,7 @@ ivas_error ivas_init_decoder(
                 return error;
             }
         }
+#endif
     }
 
     if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
@@ -2293,7 +2295,7 @@ ivas_error ivas_init_decoder(
             }
             if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
             {
-                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
+                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, output_Fs ) ) != IVAS_ERR_OK )
                 {
                     return error;
                 }
@@ -2481,9 +2483,16 @@ ivas_error ivas_init_decoder(
     if ( st_ivas->hTcBuffer == NULL )
     {
         /* no module has yet open the TC buffer, open a default one */
+#ifdef NONBE_1303_REND_GRANULARITY
+        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), output_Fs );
+        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
+
+        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )
+#else
         n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );
 
         if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
         {
             return error;
         }
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c
index 69c270b13c06f7df1fd83371aecab91f28611651..312648a330eb04d3a77821def9fb4302b89c88fe 100644
--- a/lib_dec/ivas_ism_dec.c
+++ b/lib_dec/ivas_ism_dec.c
@@ -148,7 +148,11 @@ static ivas_error ivas_ism_bitrate_switching_dec(
 
         /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
                 render what still fits in the new granularity */
-        tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
+#ifdef NONBE_1303_REND_GRANULARITY
+        tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+#else
+    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
+#endif
 
         if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
         {
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c
index adbf555bcd165934d9d57361aec34d231b485245..179e372bdb6efd6bc972859b1af16a4bc4a66c5e 100644
--- a/lib_dec/ivas_ism_param_dec.c
+++ b/lib_dec/ivas_ism_param_dec.c
@@ -403,7 +403,11 @@ ivas_error ivas_param_ism_dec_open(
     Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */
 )
 {
+#ifdef NONBE_1303_REND_GRANULARITY
+    int16_t i, granularity;
+#else
     int16_t i;
+#endif
     PARAM_ISM_DEC_HANDLE hParamIsmDec;
     IVAS_OUTPUT_SETUP hOutSetup;
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
@@ -539,6 +543,9 @@ ivas_error ivas_param_ism_dec_open(
     st_ivas->hParamIsmDec = hParamIsmDec;
     st_ivas->hSpatParamRendCom = hSpatParamRendCom;
 
+#ifdef NONBE_1303_REND_GRANULARITY
+    granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+#endif
 
     if ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE )
     {
@@ -578,7 +585,11 @@ ivas_error ivas_param_ism_dec_open(
 
         if ( st_ivas->hTcBuffer == NULL )
         {
+#ifdef NONBE_1303_REND_GRANULARITY
+            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, granularity ) ) != IVAS_ERR_OK )
+#else
             if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
             {
                 return error;
             }
@@ -591,7 +602,11 @@ ivas_error ivas_param_ism_dec_open(
         if ( st_ivas->hTcBuffer == NULL )
         {
             int16_t nchan_to_allocate = st_ivas->hDecoderConfig->nchan_out;
+#ifdef NONBE_1303_REND_GRANULARITY
+            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#else
             if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
             {
                 return error;
             }
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 8b8a3fee5ea9a501031abc454ac013a9949b03ad..a22a18a02a1f21de488a4a3d216515b7ed8d22ea 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2308,6 +2308,31 @@ static void ivas_jbm_dec_copy_tc(
 
 /*! r: render granularity */
 int16_t ivas_jbm_dec_get_render_granularity(
+#ifdef NONBE_1303_REND_GRANULARITY
+    const RENDERER_TYPE renderer_type,     /* i  : renderer type            */
+    const RENDERER_TYPE renderer_type_sec, /* i  : secondary renderer type  */
+    const int32_t output_Fs                /* i  : sampling rate            */
+)
+{
+    int16_t render_granularity;
+
+    if ( renderer_type == RENDERER_BINAURAL_OBJECTS_TD ||                                                       /* TD renderer */
+         renderer_type == RENDERER_BINAURAL_MIXER_CONV || renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM || /* Crend */
+         renderer_type_sec == RENDERER_BINAURAL_OBJECTS_TD                                                      /* TD rend as a secondary renderer -> set the common granularity for both renderers */
+    )
+    {
+        /* 5 ms granularity */
+        render_granularity = NS2SA( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
+    }
+    else
+    {
+        /* 1.25 ms granularity */
+        render_granularity = NS2SA( output_Fs, CLDFB_SLOT_NS );
+    }
+
+    return render_granularity;
+}
+#else
     const RENDERER_TYPE rendererType, /* i  : renderer type     */
     const IVAS_FORMAT ivas_format,    /* i  : ivas format */
     const MC_MODE mc_mode,            /* i  : MC mode */
@@ -2334,6 +2359,7 @@ int16_t ivas_jbm_dec_get_render_granularity(
 
     return render_granularity;
 }
+#endif
 
 
 /*--------------------------------------------------------------------------*
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index 8142e2283889cde68e8dc4b58f6d28cc842fb40e..eb742e852c26c3455dfe9b2de82decda8b7449aa 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -704,6 +704,9 @@ ivas_error ivas_masa_dec_open(
     if ( st_ivas->hTcBuffer == NULL && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC )
     {
         int16_t nchan_to_allocate, nchan_transport;
+#ifdef NONBE_1303_REND_GRANULARITY
+        int16_t granularity;
+#endif
         TC_BUFFER_MODE buffer_mode;
 
         buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -735,7 +738,13 @@ ivas_error ivas_masa_dec_open(
             nchan_to_allocate++;
         }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+
+        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#else
         if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
         {
             return error;
         }
@@ -1527,7 +1536,11 @@ ivas_error ivas_masa_dec_reconfigure(
         TC_BUFFER_MODE buffer_mode_new;
         int16_t n_samples_granularity;
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        n_samples_granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), st_ivas->hDecoderConfig->output_Fs );
+#else
         n_samples_granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
+#endif
         buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
         tc_nchan_transport = ivas_jbm_dec_get_num_tc_channels( st_ivas );
 
@@ -1544,7 +1557,9 @@ ivas_error ivas_masa_dec_reconfigure(
             }
             if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )
             {
+#ifndef NONBE_1303_REND_GRANULARITY
                 n_samples_granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); /* Use the same granularity as tdrend */
+#endif
                 if ( n_samples_granularity > st_ivas->hTcBuffer->n_samples_granularity )
                 {
                     if ( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ) != IVAS_ERR_OK )
diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c
index 299fa549c58e5477f3595a4f63fe27e86a66eaef..ad22f26478b89ae4b010f28322fbf828bc742759 100644
--- a/lib_dec/ivas_mc_param_dec.c
+++ b/lib_dec/ivas_mc_param_dec.c
@@ -437,6 +437,9 @@ ivas_error ivas_param_mc_dec_open(
     if ( hParamMC->synthesis_conf != PARAM_MC_SYNTH_MONO_STEREO )
     {
         int16_t n_cldfb_slots;
+#ifdef NONBE_1303_REND_GRANULARITY
+        int16_t granularity;
+#endif
 
         n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
         if ( st_ivas->hDecoderConfig->Opt_tsm )
@@ -457,7 +460,13 @@ ivas_error ivas_param_mc_dec_open(
 
         if ( st_ivas->hTcBuffer == NULL )
         {
+#ifdef NONBE_1303_REND_GRANULARITY
+            granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+
+            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, granularity ) ) != IVAS_ERR_OK )
+#else
             if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
             {
                 return error;
             }
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec.c
index 87b6e2d124b1de939efabcf527536e6eaa65a2bf..139b188a3bbf735d7316c911dd1e5756685c85d5 100644
--- a/lib_dec/ivas_mc_paramupmix_dec.c
+++ b/lib_dec/ivas_mc_paramupmix_dec.c
@@ -375,6 +375,9 @@ ivas_error ivas_mc_paramupmix_dec_open(
     {
         int16_t nchan_to_allocate;
         int16_t nchan_tc;
+#ifdef NONBE_1303_REND_GRANULARITY
+        int16_t granularity;
+#endif
         TC_BUFFER_MODE buffer_mode;
 
         buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -392,7 +395,13 @@ ivas_error ivas_mc_paramupmix_dec_open(
             nchan_to_allocate = MC_PARAMUPMIX_MAX_INPUT_CHANS;
         }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+
+        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#else
         if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
         {
             return error;
         }
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 2c83d296963c854ffc2ec9b2d0cd9edb553ceb8c..9e1a59cfffa874eb9506fad9c545f02996fb3e87 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -825,7 +825,11 @@ static ivas_error ivas_mc_dec_reconfig(
 
     /* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv
             render what still fits in the new granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+#else
     tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
+#endif
     if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
     {
 #ifdef FIX_HRTF_LOAD
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c
index 6532053658d711dbdeae841dbc3f98f95526e43f..6ba5dc8bec4a8e79aa5f6fac1ae111b8f867cf17 100644
--- a/lib_dec/ivas_objectRenderer_internal.c
+++ b/lib_dec/ivas_objectRenderer_internal.c
@@ -62,9 +62,13 @@ ivas_error ivas_td_binaural_open(
     }
 
 #ifdef FIX_HRTF_LOAD
+#ifdef NONBE_1303_REND_GRANULARITY
+    if ( st_ivas->hHrtfTD == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary )
+#else
     if ( st_ivas->hHrtfTD == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary &&
          ( st_ivas->ivas_format != SBA_ISM_FORMAT ) // ToDo: temporary hack to avoid ASAN errors -> see issue #1202
     )
+#endif
     {
         return IVAS_ERROR( IVAS_ERR_INTERNAL, "HRTF binary file present but not used in TD renderer" );
     }
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
index 447a1b878bc2cf657329eb60d525faff90a26c27..16428fd8693906807e24bcf44f8af1eaf4581f29 100644
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -172,6 +172,7 @@ ivas_error ivas_sba_dec_reconfigure(
     /* we may need to flush only for binaural and OSBA and TSM */
     if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
     {
+#ifndef NONBE_1303_REND_GRANULARITY
         RENDERER_TYPE renderer_type_new;
         int16_t sba_order_internal;
 
@@ -205,8 +206,11 @@ ivas_error ivas_sba_dec_reconfigure(
                 renderer_type_new = RENDERER_BINAURAL_FASTCONV_ROOM;
             }
         }
-
+#endif
         /* determine new granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+        granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), st_ivas->hDecoderConfig->output_Fs );
+#else
         granularity_new = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
 
         /* this will change anyway only with binaural */
@@ -214,6 +218,7 @@ ivas_error ivas_sba_dec_reconfigure(
         {
             granularity_new *= JBM_CLDFB_SLOTS_IN_SUBFRAME;
         }
+#endif
 
         /* flush renderer on granularity change form 5ms to 1.25ms, again only possible for binaural rendering */
         if ( granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c
index 87a118365db47ea6fc1632043479dc0d0ca23e00..001e4ab170b5b3a521582ad787f71cf1911d3650 100644
--- a/lib_dec/ivas_spar_decoder.c
+++ b/lib_dec/ivas_spar_decoder.c
@@ -228,8 +228,9 @@ ivas_error ivas_spar_dec_open(
             nchan_to_allocate += st_ivas->nchan_ism;
         }
 
+#ifndef NONBE_1303_REND_GRANULARITY
         granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
-
+#endif
         if ( ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO ) )
         {
             if ( ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO ) )
@@ -257,7 +258,13 @@ ivas_error ivas_spar_dec_open(
             granularity = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );
         }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), output_Fs );
+
         if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#else
+        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#endif
         {
             return error;
         }
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index daa4a02638d60463e188e94124642736296f4d67..dcdcfa95d297be3dfe431ae4e74a9ef95cf5a4a3 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -1055,6 +1055,8 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
 
     return IVAS_ERR_OK;
 }
+
+
 #ifdef FIX_CREND_SIMPLIFY_CODE
 /*---------------------------------------------------------------------*
  * renderer_type_to_mode()
@@ -1120,7 +1122,11 @@ ivas_error IVAS_DEC_ReadFormat(
     MC_MODE mc_mode_old;
     int16_t nchan_transport_old;
     AUDIO_CONFIG intern_config_old, transport_config_old, output_config;
+#ifdef NONBE_1303_REND_GRANULARITY
+    RENDERER_TYPE renderer_type_old, renderer_type_sec_new, renderer_type_sec_old;
+#else
     RENDERER_TYPE renderer_type_old, renderer_type_sec_new;
+#endif
 
     if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
     {
@@ -1135,6 +1141,9 @@ ivas_error IVAS_DEC_ReadFormat(
     intern_config_old = st_ivas->intern_config;
     transport_config_old = st_ivas->transport_config;
     renderer_type_old = st_ivas->renderer_type;
+#ifdef NONBE_1303_REND_GRANULARITY
+    renderer_type_sec_old = ivas_renderer_secondary_select( st_ivas );
+#endif
 
     output_config = st_ivas->hDecoderConfig->output_config;
 
@@ -1211,6 +1220,41 @@ ivas_error IVAS_DEC_ReadFormat(
             }
         }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        /* JBM: compensate when binaural renderer granularity changes (happens in bitrate switching) */
+        if ( st_ivas->ini_active_frame > 0 && st_ivas->hDecoderConfig->Opt_tsm &&
+             ( ( renderer_type_old != st_ivas->renderer_type ) ||
+               ( renderer_type_sec_old != renderer_type_sec_new ) ) )
+        {
+            int16_t tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, renderer_type_sec_new, st_ivas->hDecoderConfig->output_Fs );
+
+#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
+            st_ivas->nchan_transport = nchan_transport_old;
+#else
+            // st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200
+#endif
+
+#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
+            if ( st_ivas->ivas_format == MASA_FORMAT )
+            {
+                st_ivas->nchan_ism = 0; // ToDo: temporary hack to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1199
+            }
+#endif
+            if ( st_ivas->hTcBuffer == NULL )
+            {
+                return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+            }
+
+            /* when granularity goes down, render what still fits in the new granularity */
+            if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )
+            {
+                if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, pcm_type_API_to_internal( hIvasDec->pcmType ), hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )
+                {
+                    return error;
+                }
+            }
+        }
+#else
 #ifdef FIX_HRTF_LOAD
 #ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN
         if ( ( renderer_type_old != st_ivas->renderer_type && renderer_type_old != RENDERER_DISABLE ) ||
@@ -1245,6 +1289,7 @@ ivas_error IVAS_DEC_ReadFormat(
                 }
             }
         }
+#endif
 #endif
     }
 
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c
index 2afb929868c940160b4a530a86618b3725b21e4e..343de51bd3ada8ddf4305348b251ac19b1b8337a 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions.c
@@ -143,12 +143,19 @@ ivas_error ivas_dirac_dec_init_binaural_data(
     float frequency_axis[CLDFB_NO_CHANNELS_MAX];
     int16_t num_poses, pos_idx;
     const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;
+
     num_poses = 1;
     if ( st_ivas->hSplitBinRend != NULL )
     {
         num_poses = st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;
     }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+    output_Fs = st_ivas->hDecoderConfig->output_Fs;
+    nBins = st_ivas->hSpatParamRendCom->num_freq_bands;
+    renderer_type = st_ivas->renderer_type;
+#endif
+
     for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
     {
         hDiracDecBin = st_ivas->hDiracDecBin[pos_idx];
@@ -321,11 +328,15 @@ ivas_error ivas_dirac_dec_init_binaural_data(
             nchan_to_allocate = BINAURAL_CHANNELS + st_ivas->nchan_ism;
         }
 
+#ifdef NONBE_1303_REND_GRANULARITY
+        n_samples_granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), output_Fs );
+#else
         n_samples_granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
         if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )
         {
             n_samples_granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); /* Use the same granularity as tdrend */
         }
+#endif
 
         if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, ivas_jbm_dec_get_num_tc_channels( st_ivas ), nchan_to_allocate, nchan_to_allocate, n_samples_granularity ) ) != IVAS_ERR_OK )
         {