diff --git a/lib_com/options.h b/lib_com/options.h
index 21c7885e4d4450b58c66da37ec298f0eb72735dd..5b8ab37e69c1472de222c1fda5c0f98957afd9f6 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,13 +164,14 @@
 #define FIX_392_LATE_REVERB                             /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/
 
 #define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */
-
 #define ISSUE_24_CLEANUP_MCT_LFE                        /* Issue 24: Cleanup LFE path withing MCT */
-
 #define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */
 
 #define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */
 #define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */
+#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */
+
+
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c
index b4eb783624a3e2115d73c4dda09e06d991af8799..362942c52e963472083456e18f3a1fd2234e92bb 100644
--- a/lib_dec/ivas_dec.c
+++ b/lib_dec/ivas_dec.c
@@ -266,7 +266,15 @@ ivas_error ivas_dec(
                 /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */
                 ivas_ism_render( st_ivas, output, output_frame );
             }
+#ifdef REND_DEBUGGING_REVISION
+#ifdef DEBUGGING
             else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
+#else
+            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )
+#endif
+#else
+            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
+#endif
             {
                 /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
 #ifdef NCHAN_ISM_PARAMETER
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index f522a3217d2e9fff9e0422e6dea667e4697ca3a9..c005e95fab2c9df62ad9364af84a10d9c1c45e21 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -114,7 +114,7 @@ void ivas_renderer_select(
                 else
                 {
                     *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;
-#if defined( DEBUGGING )
+#ifdef DEBUGGING
                     if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV )
                     {
                         *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;