diff --git a/apps/decoder.c b/apps/decoder.c
index 7ad7441f03b9528675a7660c5eeb8c882860c328..1df9c9353e83eac197ed6262e3430cd3b8f4dff8 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -3250,7 +3250,14 @@ static ivas_error decodeVoIP(
         }
         vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
         frame++;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+        if ( vec_pos_update == 0 )
+        {
+            systemTime_ms += vec_pos_len * systemTimeInc_ms;
+        }
+#else
         systemTime_ms += systemTimeInc_ms;
+#endif
 
 #ifdef WMOPS
         update_mem();
@@ -3258,6 +3265,90 @@ static ivas_error decodeVoIP(
 #endif
     }
 
+
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    int16_t nSamplesFlushed = 0;
+
+    /* decode and get samples */
+    if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )
+    {
+        fprintf( stderr, "\nError in IVAS_DEC_VoIP_Flush: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+        goto cleanup;
+    }
+
+    if ( nSamplesFlushed )
+    {
+        /* Write current frame */
+        if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, nSamplesFlushed * nOutChannels ) ) != IVAS_ERR_OK )
+        {
+            fprintf( stderr, "\nOutput audio file writer error\n" );
+            goto cleanup;
+        }
+
+        /* Write ISm metadata to external file(s) */
+        if ( decodedGoodFrame && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
+        {
+            if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM || bsFormat == IVAS_DEC_BS_SBA_ISM )
+            {
+                if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, &numObj ) ) != IVAS_ERR_OK )
+                {
+                    fprintf( stderr, "\nError in IVAS_DEC_GetNumObjects: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+                    goto cleanup;
+                }
+
+                for ( i = 0; i < numObj; ++i )
+                {
+                    IVAS_ISM_METADATA IsmMetadata;
+
+                    if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 0, i ) ) != IVAS_ERR_OK )
+                    {
+                        fprintf( stderr, "\nError in IVAS_DEC_GetObjectMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+                        goto cleanup;
+                    }
+
+                    if ( ( IsmFileWriter_writeFrame( IsmMetadata, ismWriters[i] ) ) != IVAS_ERR_OK )
+                    {
+                        fprintf( stderr, "\nError writing ISM metadata to file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) );
+                        goto cleanup;
+                    }
+                }
+            }
+
+            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )
+            {
+                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
+#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
+                int16_t fullDelayNumSamples[3];
+                float delayMs;
+
+                /* delayNumSamples is zeroed, and delayNumSamples_orig is updated only on first good frame, so need to re-fetch delay info */
+                if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )
+                {
+                    fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
+                }
+#endif
+                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
+                {
+                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+                    goto cleanup;
+                }
+
+#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
+                delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
+                if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
+#else
+                if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
+#endif
+                {
+                    fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
+                    goto cleanup;
+                }
+            }
+        }
+    }
+#endif
+
+
     /*------------------------------------------------------------------------------------------*
      * Add zeros at the end to have equal length of synthesized signals
      *------------------------------------------------------------------------------------------*/
diff --git a/apps/encoder.c b/apps/encoder.c
index 1ae2be6d22da31b1827675114f15927a41ba1f7b..798c99c11ff5180d97ca2718f333e3ff4984ec88 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -785,12 +785,7 @@ int main(
         }
 
         /* *** Encode one frame *** */
-        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits
-#ifdef DBG_BITSTREAM_ANALYSIS
-                                                     ,
-                                                     frame
-#endif
-                                                     ) ) != IVAS_ERR_OK )
+        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
             goto cleanup;
diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index 6b37cdae8c052180dc4c62c5229c6c058eea0533..7d10e51557b9b1b8190ea7e923ce4dd8b6e66824 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -37,9 +37,6 @@
 #include <assert.h>
 #include <stdint.h>
 #include "options.h"
-#ifdef DEBUGGING
-#include "debug.h"
-#endif
 #include "cnst.h"
 #include "prot.h"
 #include "stat_enc.h"
@@ -50,9 +47,12 @@
 #include "ivas_cnst.h"
 #include "ivas_rom_com.h"
 #include "wmc_auto.h"
+#ifdef DEBUGGING
+#include "debug.h"
 #ifdef DBG_BITSTREAM_ANALYSIS
 #include <string.h>
 #endif
+#endif
 
 #ifdef DEBUGGING
 
@@ -212,7 +212,7 @@ ivas_error ind_list_realloc(
         {
             new_ind_list[i].id = old_ind_list[i].id;
             new_ind_list[i].value = old_ind_list[i].value;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );
 #endif
         }
@@ -223,7 +223,7 @@ ivas_error ind_list_realloc(
     for ( ; i < max_num_indices; i++ )
     {
         new_ind_list[i].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         sprintf( new_ind_list[i].function_name, "RESET in ind_list_realloc" );
 #endif
     }
@@ -812,7 +812,7 @@ void move_indices(
             new_ind_list[i].value = old_ind_list[i].value;
             new_ind_list[i].nb_bits = old_ind_list[i].nb_bits;
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );
 #endif
             old_ind_list[i].nb_bits = -1;
@@ -825,12 +825,12 @@ void move_indices(
             new_ind_list[i].id = old_ind_list[i].id;
             new_ind_list[i].value = old_ind_list[i].value;
             new_ind_list[i].nb_bits = old_ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );
 #endif
 
             old_ind_list[i].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             sprintf( old_ind_list[i].function_name, "RESET in move_indices" );
 #endif
         }
@@ -909,7 +909,7 @@ ivas_error check_ind_list_limits(
     return error;
 }
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 const char *named_indices_table[] = {
     "IND_IVAS_FORMAT",
     "IND_SMODE_OMASA",
@@ -2837,7 +2837,7 @@ ivas_error push_indice(
             hBstr->ind_list[j].id = hBstr->ind_list[j - 1].id;
             hBstr->ind_list[j].nb_bits = hBstr->ind_list[j - 1].nb_bits;
             hBstr->ind_list[j].value = hBstr->ind_list[j - 1].value;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             strncpy( hBstr->ind_list[j].function_name, hBstr->ind_list[j - 1].function_name, 100 );
 #endif
         }
@@ -2848,7 +2848,7 @@ ivas_error push_indice(
     hBstr->ind_list[i].id = id;
     hBstr->ind_list[i].value = value;
     hBstr->ind_list[i].nb_bits = nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
     strncpy( hBstr->ind_list[i].function_name, named_indices_table[id], 100 );
 #endif
 
@@ -2865,7 +2865,7 @@ ivas_error push_indice(
  * Push a new indice into the buffer at the next position
  *-------------------------------------------------------------------*/
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 ivas_error push_next_indice_(
     const char *caller,
 #else
@@ -2915,7 +2915,7 @@ ivas_error push_next_indice(
     hBstr->ind_list[hBstr->nb_ind_tot].value = value;
     hBstr->ind_list[hBstr->nb_ind_tot].nb_bits = nb_bits;
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
     strncpy( hBstr->ind_list[hBstr->nb_ind_tot].function_name, caller, 100 );
 #endif
 
@@ -2932,7 +2932,7 @@ ivas_error push_next_indice(
  * Push a bit buffer into the buffer at the next position
  *-------------------------------------------------------------------*/
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 ivas_error push_next_bits_(
     const char *caller,
 #else
@@ -2978,7 +2978,7 @@ ivas_error push_next_bits(
         ptr->value = code;
         ptr->nb_bits = 16;
         ptr->id = prev_id;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         strncpy( ptr->function_name, caller, 100 );
 #endif
         hBstr->nb_ind_tot++;
@@ -2997,7 +2997,7 @@ ivas_error push_next_bits(
         ptr->value = bits[i];
         ptr->nb_bits = 1;
         ptr->id = prev_id;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         strncpy( ptr->function_name, caller, 100 );
 #endif
         hBstr->nb_ind_tot++;
@@ -3069,7 +3069,7 @@ uint16_t delete_indice(
             hBstr->ind_list[j].id = hBstr->ind_list[i].id;
             hBstr->ind_list[j].value = hBstr->ind_list[i].value;
             hBstr->ind_list[j].nb_bits = hBstr->ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             strncpy( hBstr->ind_list[j].function_name, hBstr->ind_list[i].function_name, 100 );
 #endif
         }
@@ -3083,7 +3083,7 @@ uint16_t delete_indice(
     {
         /* reset the shifted indices at the end of the list */
         hBstr->ind_list[j].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         sprintf( hBstr->ind_list[j].function_name, "RESET in delete_indice" );
 #endif
     }
@@ -3388,10 +3388,6 @@ static ivas_error write_indices_element(
     uint16_t **pt_stream,    /* i  : pointer to bitstream buffer                                     */
     const int16_t is_SCE,    /* i  : flag to distingusih SCE and CPE                                 */
     const int16_t element_id /* i  : id of the SCE or CPE                                            */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 )
 {
     int16_t ch;
@@ -3513,7 +3509,7 @@ static ivas_error write_indices_element(
     }
 
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
     if ( is_SCE ) /* EVS and SCE */
     {
         static FILE *f1 = 0;
@@ -3625,10 +3621,6 @@ ivas_error write_indices_ivas(
     Encoder_Struct *st_ivas, /* i/o: encoder state structure             */
     uint16_t *bit_stream,    /* i/o: output bitstream                    */
     uint16_t *num_bits       /* i  : number of indices written to output */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 )
 {
     int16_t i, n;
@@ -3694,22 +3686,12 @@ ivas_error write_indices_ivas(
 
     for ( n = 0; n < st_ivas->nSCE; n++ )
     {
-        write_indices_element( st_ivas, &pt_stream, 1, n
-#ifdef DBG_BITSTREAM_ANALYSIS
-                               ,
-                               frame
-#endif
-        );
+        write_indices_element( st_ivas, &pt_stream, 1, n );
     }
 
     for ( n = 0; n < st_ivas->nCPE; n++ )
     {
-        write_indices_element( st_ivas, &pt_stream, 0, n
-#ifdef DBG_BITSTREAM_ANALYSIS
-                               ,
-                               frame
-#endif
-        );
+        write_indices_element( st_ivas, &pt_stream, 0, n );
     }
 
     *num_bits = (uint16_t) ( pt_stream - bit_stream );
diff --git a/lib_com/options.h b/lib_com/options.h
index d28fa86b27b0aaaf962baaae5c21bffd8c87fce8..8e261a70e36f35c6c5afff800486029e602f963a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -168,6 +168,8 @@
 #define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */
 
 #define NONBE_1319_M2R_PRECISION_ALIGN                  /* Nokia: bring updates from PC code related to OMASA masa2total ratios */
+#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */
+
 
 /* #################### End FIXES switches ############################ */
 
diff --git a/lib_com/prot.h b/lib_com/prot.h
index 42013ceec23257529b13edd4a9be8c8cdcb74f69..98c6b8464f7aad36a60e81c97b3c8708951325b6 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -479,12 +479,12 @@ ivas_error push_indice(
     int16_t nb_bits        /* i  : number of bits used to quantize the indice  */
 );
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 #define push_next_indice( ... ) push_next_indice_( __func__, __VA_ARGS__ )
 #define push_next_bits( ... )   push_next_bits_( __func__, __VA_ARGS__ );
 #endif
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 ivas_error push_next_indice_(
     const char *caller,
 #else
@@ -495,7 +495,7 @@ ivas_error push_next_indice(
     int16_t nb_bits /* i  : number of bits used to quantize the indice */
 );
 
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 ivas_error push_next_bits_(
     const char *caller,
 #else
@@ -595,10 +595,6 @@ ivas_error write_indices_ivas(
     Encoder_Struct *st_ivas, /* i/o: encoder state structure                                       */
     uint16_t *bit_stream,    /* i/o: output bitstream                                              */
     uint16_t *num_bits       /* i/o: number of bits written to output                              */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 );
 
 Word16 rate2EVSmode(
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 715262e1ff8f163f0fc23cab9d8bb59d22b2e71b..e08b838e3cca71d934eb827f380d4b61e38e6193 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -59,6 +59,9 @@ struct IVAS_DEC_VOIP
     uint16_t lastDecodedWasActive;
     JB4_DATAUNIT_HANDLE hCurrentDataUnit; /* Points to the currently processed data unit */
     uint16_t *bs_conversion_buf;          /* Buffer for bitstream conversion from packed to serial */
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    int16_t nSamplesRendered20ms; /* how many samples have been rendered since the last 20ms render border*/
+#endif
 #ifdef SUPPORT_JBM_TRACEFILE
     IVAS_JBM_TRACE_DATA JbmTraceData;
 #endif
@@ -80,6 +83,9 @@ struct IVAS_DEC
     bool Opt_VOIP;           /* flag indicating VOIP mode with JBM */
     int16_t tsm_scale;       /* scale for TSM operation */
     int16_t tsm_max_scaling;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    int16_t timeScalingDone; /* have we done already one TSM in a 20ms frame? */
+#endif
     float tsm_quality;
     float *apaExecBuffer; /* Buffer for APA scaling */
     PCMDSP_APA_HANDLE hTimeScaler;
@@ -120,7 +126,9 @@ static ivas_error isar_set_split_rend_setup( ISAR_DEC_SPLIT_REND_WRAPPER *hSplit
 static ivas_error ivas_create_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
 static void ivas_destroy_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
 static int16_t get_render_frame_size_ms( IVAS_RENDER_FRAMESIZE render_framesize );
-
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+static void update_voip_rendered20ms( IVAS_DEC_HANDLE hIvasDec, const int16_t nSamplesRendered );
+#endif
 
 /*---------------------------------------------------------------------*
  * IVAS_DEC_Open()
@@ -157,6 +165,9 @@ ivas_error IVAS_DEC_Open(
     hIvasDec->tsm_scale = 100;
     hIvasDec->tsm_max_scaling = 0;
     hIvasDec->tsm_quality = 1.0f;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    hIvasDec->timeScalingDone = 0;
+#endif
     hIvasDec->needNewFrame = false;
     hIvasDec->nTransportChannelsOld = 0;
     hIvasDec->nSamplesAvailableNext = 0;
@@ -754,6 +765,9 @@ ivas_error IVAS_DEC_EnableVoIP(
     hIvasDec->hVoIP->lastDecodedWasActive = 0;
     hIvasDec->hVoIP->hCurrentDataUnit = NULL;
     hIvasDec->hVoIP->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC );
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    hIvasDec->hVoIP->nSamplesRendered20ms = 0;
+#endif
 
 #define WMC_TOOL_SKIP
     /* Bitstream conversion is not counted towards complexity and memory usage */
@@ -999,18 +1013,27 @@ ivas_error IVAS_DEC_GetSamples(
 
                     assert( nTimeScalerOutSamples <= APA_BUF );
                     nSamplesTcsScaled = nTimeScalerOutSamples / nTransportChannels;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+                    hIvasDec->timeScalingDone = 1;
+#endif
                 }
                 else
                 {
                     nSamplesTcsScaled = hIvasDec->nSamplesFrame;
                 }
 
+#ifdef DEBUG_MODE_JBM
+                dbgwrite( &nTimeScalerOutSamples, sizeof( uint16_t ), 1, 1, "./res/JBM_nTimeScaleOutSamples.dat" );
+#endif
                 /* Feed decoded transport channels samples to the renderer */
                 if ( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer ) ) != IVAS_ERR_OK )
                 {
                     return error;
                 }
 
+#ifdef DEBUG_MODE_JBM
+                dbgwrite( &nResidualSamples, sizeof( int16_t ), 1, 1, "./res/JBM_nResidualSamples.dat" );
+#endif
                 if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
                 {
                     /* feed residual samples to TSM for the next call */
@@ -1437,6 +1460,9 @@ static ivas_error IVAS_DEC_GetBufferedNumberOfSamples(
     if ( hIvasDec->st_ivas->hTcBuffer != NULL )
     {
         *nSamplesBuffered = hIvasDec->st_ivas->hTcBuffer->n_samples_buffered - hIvasDec->st_ivas->hTcBuffer->n_samples_rendered;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+        *nSamplesBuffered += hIvasDec->hVoIP->nSamplesRendered20ms;
+#endif
     }
 
     return IVAS_ERR_OK;
@@ -2479,7 +2505,9 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
     uint32_t extBufferedTime_ms, scale, maxScaling;
     JB4_DATAUNIT_HANDLE dataUnit;
     uint16_t extBufferedSamples;
+#ifndef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
     int16_t timeScalingDone;
+#endif
     int16_t result;
     ivas_error error;
     int16_t nSamplesRendered;
@@ -2488,7 +2516,9 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
     st_ivas = hIvasDec->st_ivas;
     hDecoderConfig = st_ivas->hDecoderConfig;
     hVoIP = hIvasDec->hVoIP;
+#ifndef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
     timeScalingDone = 0;
+#endif
     nOutChannels = (uint8_t) st_ivas->hDecoderConfig->nchan_out;
     nSamplesRendered = 0;
 
@@ -2512,10 +2542,15 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
                 }
             }
 
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+            extBufferedSamples = nSamplesBuffered;
+#else
             extBufferedSamples = nSamplesRendered + nSamplesBuffered;
+#endif
             extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs;
             dataUnit = NULL;
 
+
             /* pop one access unit from the jitter buffer */
             result = JB4_PopDataUnit( hVoIP->hJBM, systemTimestamp_ms, extBufferedTime_ms, &dataUnit, &scale, &maxScaling );
             if ( result != 0 )
@@ -2524,17 +2559,30 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
             }
             maxScaling = maxScaling * hDecoderConfig->output_Fs / 1000;
 
+#ifdef DEBUG_MODE_JBM
+            dbgwrite( &extBufferedSamples, sizeof( uint16_t ), 1, 1, "./res/JBM_extBufferedSamples.dat" );
+            dbgwrite( &systemTimestamp_ms, sizeof( uint32_t ), 1, 1, "./res/JBM_systemTimestamp.dat" );
+            dbgwrite( &scale, sizeof( uint32_t ), 1, 1, "./res/JBM_scale.dat" );
+            dbgwrite( &maxScaling, sizeof( uint32_t ), 1, 1, "./res/JBM_maxScale.dat" );
+#endif
+
             /* avoid time scaling multiple times in one sound card slot */
             if ( scale != 100U )
             {
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+                if ( hIvasDec->timeScalingDone )
+#else
                 if ( timeScalingDone )
+#endif
                 {
                     scale = 100;
                 }
+#ifndef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
                 else
                 {
                     timeScalingDone = 1;
                 }
+#endif
             }
 
             /* limit scale to range supported by time scaler */
@@ -2619,6 +2667,9 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
             nSamplesRendered += nSamplesToZero;
             hIvasDec->nSamplesRendered += nSamplesToZero;
             hIvasDec->nSamplesAvailableNext -= nSamplesToZero;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+            update_voip_rendered20ms( hIvasDec, nSamplesToZero );
+#endif
         }
         else
         {
@@ -2633,12 +2684,37 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
             }
 
             nSamplesRendered += nSamplesRendered_loop;
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+            update_voip_rendered20ms( hIvasDec, nSamplesRendered_loop );
+#endif
         }
     }
 
     return IVAS_ERR_OK;
 }
 
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+/*---------------------------------------------------------------------*
+ * update_voip_rendered20ms( )
+ *
+ * Function to flush remaining audio in VoIP
+ *---------------------------------------------------------------------*/
+
+static void update_voip_rendered20ms(
+    IVAS_DEC_HANDLE hIvasDec,
+    const int16_t nSamplesRendered )
+{
+    int16_t nSamplesRenderedTotal;
+    nSamplesRenderedTotal = hIvasDec->hVoIP->nSamplesRendered20ms + nSamplesRendered;
+    /* we have crossed a 20ms border, reset the time scaling done flag */
+    if ( nSamplesRenderedTotal >= hIvasDec->hVoIP->nSamplesFrame )
+    {
+        hIvasDec->timeScalingDone = 0;
+    }
+    hIvasDec->hVoIP->nSamplesRendered20ms = nSamplesRenderedTotal % hIvasDec->hVoIP->nSamplesFrame;
+}
+
+#endif
 
 /*---------------------------------------------------------------------*
  * IVAS_DEC_VoIP_Flush( )
@@ -2663,8 +2739,19 @@ ivas_error IVAS_DEC_Flush(
     nSamplesToRender = (uint16_t) *nSamplesFlushed;
 
     /* render IVAS frames  */
-    error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmType, pcmBuf );
-
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    error = IVAS_ERR_OK;
+    if ( nSamplesToRender > 0 && hIvasDec->st_ivas->ivas_format != MONO_FORMAT )
+    {
+#endif
+        error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmType, pcmBuf );
+#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
+    }
+    else
+    {
+        *nSamplesFlushed = 0;
+    }
+#endif
     return error;
 }
 
diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c
index f7b5a4dd76079a33e4d43b6d0f699317a2150544..b5339333d3156033315946605994d27c7b5d611a 100644
--- a/lib_enc/ivas_corecoder_enc_reconfig.c
+++ b/lib_enc/ivas_corecoder_enc_reconfig.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 #endif
 #include "wmc_auto.h"
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 #include <string.h>
 #endif
 
@@ -170,7 +170,7 @@ ivas_error ivas_corecoder_enc_reconfig(
                 temp_ind_list[i].id = hBstr->ind_list[i].id;
                 temp_ind_list[i].value = hBstr->ind_list[i].value;
                 temp_ind_list[i].nb_bits = hBstr->ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                 strncpy( temp_ind_list[i].function_name, hBstr->ind_list[i].function_name, 100 );
 #endif
                 hBstr->ind_list[i].nb_bits = -1;
@@ -376,7 +376,7 @@ ivas_error ivas_corecoder_enc_reconfig(
                     st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id;
                     st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value;
                     st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                     strncpy( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].function_name, temp_ind_list[i].function_name, 100 );
 #endif
                 }
@@ -396,7 +396,7 @@ ivas_error ivas_corecoder_enc_reconfig(
                     st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id;
                     st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value;
                     st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                     strncpy( st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].function_name, temp_ind_list[i].function_name, 100 );
 #endif
                 }
diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c
index cd6a43f2b4039a33a196067ee7c882c42d5d41c5..6f2672cfc8ef9fcb6e7a821ec00342b0986742f6 100644
--- a/lib_enc/ivas_init_enc.c
+++ b/lib_enc/ivas_init_enc.c
@@ -42,7 +42,7 @@
 #include "debug.h"
 #endif
 #include "wmc_auto.h"
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 #include <string.h>
 #endif
 
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c
index 3e4289cb1c969c0ca66f887cb69930a2786d7df3..b4c480f1ccb4ea0f1a85fc29b890d912177144a3 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc.c
@@ -42,7 +42,7 @@
 #include "wmc_auto.h"
 #include "prot.h"
 #include "basop_settings.h"
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
 #include <string.h>
 #endif
 
@@ -1276,7 +1276,7 @@ void reset_metadata_spatial(
                 for ( i = 0; i < next_ind_sid; i++ )
                 {
                     hMetaData->ind_list[i].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                     sprintf( hMetaData->ind_list[i].function_name, "RESET in reset_metadata_spatial" );
 #endif
                 }
@@ -1285,12 +1285,12 @@ void reset_metadata_spatial(
                 {
                     hMetaData->ind_list[j].value = hMetaData->ind_list[i].value;
                     hMetaData->ind_list[j].nb_bits = hMetaData->ind_list[i].nb_bits;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                     strncpy( hMetaData->ind_list[j].function_name, hMetaData->ind_list[i].function_name, 100 );
 #endif
                     hMetaData->nb_bits_tot += hMetaData->ind_list[j].nb_bits;
                     hMetaData->ind_list[i].nb_bits = -1;
-#ifdef BISTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
                     sprintf( hMetaData->ind_list[i].function_name, "RESET in reset_metadata_spatial" );
 #endif
                 }
@@ -1317,7 +1317,7 @@ void reset_metadata_spatial(
             hMetaData->nb_ind_tot--;
             hMetaData->nb_bits_tot -= hMetaData->ind_list[hMetaData->nb_ind_tot].nb_bits;
             hMetaData->ind_list[hMetaData->nb_ind_tot].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
             sprintf( hMetaData->ind_list[hMetaData->nb_ind_tot].function_name, "RESET in reset_metadata_spatial" );
 #endif
         }
@@ -1975,7 +1975,7 @@ void restore_metadata_buffer(
     for ( i = next_ind_start; i < hMetaData->nb_ind_tot; i++ )
     {
         hMetaData->ind_list[i].nb_bits = -1;
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         sprintf( hMetaData->ind_list[i].function_name, "RESET in restore_metadata_buffer" );
 #endif
     }
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index e6b2ff27e94d7a326563449d910e1e232664b55f..4420cab10ac0330e332f34f2f8085c2dfd892a41 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -450,7 +450,7 @@ static void write_metadata_buffer(
 
     for ( i = 0; i < hMetaData_tmp->nb_ind_tot; i++ )
     {
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         push_next_indice_( hMetaData_tmp->ind_list[i].function_name, hMetaData, hMetaData_tmp->ind_list[i].value, hMetaData_tmp->ind_list[i].nb_bits );
 #else
         push_next_indice( hMetaData, hMetaData_tmp->ind_list[i].value, hMetaData_tmp->ind_list[i].nb_bits );
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
index 9b9a873ea1d4e64aa8777d36c680c1ab51438d47..2a044791b241af1f5fb5eb7ea6cd6134ea0f1ef6 100644
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -1143,10 +1143,6 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
     int16_t inputBufferSize,   /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
     uint16_t *outputBitStream, /* o  : pointer to serial output bitstream. The array must already be allocated and be of size at least IVAS_MAX_BITS_PER_FRAME */
     uint16_t *numOutBits       /* o  : number of bits written to output bitstream. Each bit is stored as a single uint16_t value           */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 )
 {
     Encoder_Struct *st_ivas;
@@ -1244,7 +1240,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
         {
             st_ivas->ind_list[i].nb_bits = -1;
         }
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
         for ( i = 0; i < st_ivas->ivas_max_num_indices; i++ )
         {
             memset( st_ivas->ind_list[i].function_name, 'A', 100 * sizeof( char ) );
@@ -1352,12 +1348,7 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
     }
 
     /* write indices into bitstream buffer */
-    write_indices_ivas( st_ivas, outputBitStream, numOutBits
-#ifdef DBG_BITSTREAM_ANALYSIS
-                        ,
-                        frame
-#endif
-    );
+    write_indices_ivas( st_ivas, outputBitStream, numOutBits );
 
     /* Reset switching flag before next call - can be set to "true" by some setters */
     hIvasEnc->switchingActive = false;
@@ -1378,21 +1369,12 @@ ivas_error IVAS_ENC_EncodeFrameToCompact(
     const int16_t inputBufferSize, /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
     uint8_t *outputBitStream,      /* o  : pointer to compact output bitstream. The array must already be allocated.                           */
     uint16_t *numOutBits           /* o  : number of bits written to output bitstream                                                          */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 )
 {
     ivas_error error;
     uint16_t bitstream[IVAS_MAX_BITS_PER_FRAME];
 
-    if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, inputBuffer, inputBufferSize, bitstream, numOutBits
-#ifdef DBG_BITSTREAM_ANALYSIS
-                                                 ,
-                                                 frame
-#endif
-                                                 ) ) != IVAS_ERR_OK )
+    if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, inputBuffer, inputBufferSize, bitstream, numOutBits ) ) != IVAS_ERR_OK )
     {
         return error;
     }
diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h
index 043e4c2713670938bded27b64e6dfddf63d2a64b..5a42c3dad1ebe2eb7df9caa796d0422902b35177 100644
--- a/lib_enc/lib_enc.h
+++ b/lib_enc/lib_enc.h
@@ -298,10 +298,6 @@ ivas_error IVAS_ENC_EncodeFrameToSerial(
     int16_t inputBufferSize,                        /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
     uint16_t *outputBitStream,                      /* o  : pointer to serial output bitstream. The array must already be allocated and be of size at least IVAS_MAX_BITS_PER_FRAME */
     uint16_t *numOutBits                            /* o  : number of bits written to output bitstream. Each bit is stored as a single uint16_t value           */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 );
 
 /*! r: error code */
@@ -311,10 +307,6 @@ ivas_error IVAS_ENC_EncodeFrameToCompact(
     const int16_t inputBufferSize,                  /* i  : total number of samples in the input buffer. Related function: IVAS_ENC_GetInputBufferSize()        */
     uint8_t *outputBitStream,                       /* o  : pointer to compact output bitstream. The array must already be allocated.                           */
     uint16_t *numOutBits                            /* o  : number of bits written to output bitstream                                                          */
-#ifdef DBG_BITSTREAM_ANALYSIS
-    ,
-    int32_t frame
-#endif
 );
 
 /* Setter functions - apply changes to encoder configuration */
diff --git a/lib_enc/stat_enc.h b/lib_enc/stat_enc.h
index a2a4fd06e34b117720677f7dbf86561f7be9b996..05e56ef4a9a15a333e8aaa718810560190eeddd3 100644
--- a/lib_enc/stat_enc.h
+++ b/lib_enc/stat_enc.h
@@ -55,7 +55,7 @@ typedef struct
     int16_t id;      /* id of the indice */
     uint16_t value;  /* value of the quantized indice */
     int16_t nb_bits; /* number of bits used for the quantization of the indice */
-#ifdef DBG_BITSTREAM_ANALYSIS
+#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )
     char function_name[100];
 #endif
 } Indice, *INDICE_HANDLE;