diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0a7d37b55ca1741b48640db937bb5eee4049595..57ae4828714650c15dc1ebbe6a02e0caaea3f4e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1063,7 +1063,6 @@ 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
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 1dff6b76cf4c57b058e4c5987042bc563044e301..b2dd1e3e76cf75c32902a0eace9c19cdfd60cb4d 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -183,7 +183,7 @@
 #define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */
 #define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */
 #define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */
-
+#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index f265975d506ce14ca1ffecf94f43459000a90a60..95d9fb03e67c6f4d708f3f2da771185544017c2f 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -3401,7 +3401,11 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx(
 
         test();
         test();
+#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA
+        if ( EQ_16( num_tc, 3 ) )
+#else
         if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )
+#endif
         {
             num_tc = add( num_tc, 1 );
         }