diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 886fa96f1ee6c66ee0db06dbb82517f8db122612..c0a7d37b55ca1741b48640db937bb5eee4049595 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1063,6 +1063,7 @@ check-naming-of-branch-for-main-pc-merges:
   script:
     - *update-scripts-repo
     - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then
+    -   git fetch
     -   ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
     - fi
 
@@ -1339,8 +1340,7 @@ split-rendering-pytest-on-merge-request:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
   needs: ["build-codec-linux-make"]
-  # TODO: set reasonable timeout, will most likely take less
-  timeout: "30 minutes"
+  timeout: "45 minutes"
   stage: compare
   script:
     - *print-common-info
diff --git a/lib_com/options.h b/lib_com/options.h
index 7e5b833701026e12024d0d3f813817bd79d0c434..1b33049745599199a1612d5655d602450a7c877a 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -181,6 +181,8 @@
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #endif
 
+#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */
+
 /* #################### End BASOP porting switches ############################ */
 
 #endif
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index c3bcb8ec14f73b978dda05717a03fe73d5eaaf27..f265975d506ce14ca1ffecf94f43459000a90a60 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -2789,7 +2789,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
         hTcBuffer->n_samples_buffered = add( hTcBuffer->n_samples_granularity, n_samples_still_available );
         hTcBuffer->n_samples_available = 0;
         hTcBuffer->n_samples_flushed = n_samples_to_render;
-#ifdef CR_FIX_JBM_FLUSH_OFFSET
+#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
         hTcBuffer->n_samples_rendered = 0;
 #else
         hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
@@ -2994,7 +2994,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
         {
             return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );
         }
-#ifdef CR_FIX_JBM_FLUSH_OFFSET
+#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET
         hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
 #endif
     }