diff --git a/lib_com/options.h b/lib_com/options.h
index b02e63cd1ee4d0fa841168a6d68b7105c309e1fb..c044ea372a569653228bebeaac3e4244b54b5498 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -149,8 +149,8 @@
 /* only BE switches wrt operation points tested in selection */
 
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
-
-
+#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/
+#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */
 #define FIX_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */
 #define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */
 #define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c
index 415182dfc9d22285c87630621b0ac8b8ba1d4777..c1ea3765a21b482088f208e6f947e04dd965ecf6 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec.c
@@ -1718,8 +1718,11 @@ void ivas_dirac_dec_read_BS(
 
         /* subtract mode signaling bits, since bitstream was moved after mode reading */
         st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS );
-
+#ifndef SBA_MODE_CLEANUP_2
         /* 1 bit flag for SPAR/DirAC, already read in read format function */
+#else
+        /* 1 bit flag for signaling metadata to read */
+#endif
         b = st->bit_stream[( st->next_bit_pos )--];
         ( *nb_bits )++;
         hQMetaData->sba_inactive_mode = 1;
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 4ef5b2bb9f6c49bf39f61f4c564841b2d4384e99..ee15c79faa26dd36a659b945bcdae2ed26dd57b2 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -481,9 +481,11 @@ static ivas_error ivas_read_format(
 
         if ( st_ivas->ivas_format == SBA_FORMAT )
         {
+#ifndef SBA_MODE_CLEANUP_2
             int16_t tc_mode_offset;
             tc_mode_offset = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 );
             idx = st_ivas->bit_stream[tc_mode_offset];
+#endif
             if ( st_ivas->sba_analysis_order == 0 )
             {
                 st_ivas->sba_analysis_order = SBA_FOA_ORDER;
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c
index 9e2d01f4dd40a6e0d3e9c24a1ba670e84a35da66..a2d6d1502c340d3bb7c88b8908b7e05b5b3cc55f 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec.c
@@ -1202,8 +1202,13 @@ int16_t ivas_qmetadata_dec_sid_decode(
 
     if ( ivas_format == SBA_FORMAT )
     {
+#ifndef FIX_137_SID_MD_BITS
         /* TODO: still use old sid frame size to keep bitexactness */
         metadata_sid_bits = (int16_t) ( 5000 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * 18 ) - 1; /* -1 for inactive mode header bit*/
+#else
+        metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND ) - 2 - SID_FORMAT_NBITS; /* -1 for inactive mode header bit*/
+
+#endif
     }
     else
     {
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c
index 3355db5b66cb7c450957fd479c3da9d160433763..de0c9196d41fc261dd9d5747eca778a7744d15b3 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc.c
@@ -979,8 +979,13 @@ void ivas_qmetadata_enc_sid_encode(
 
     if ( ivas_format == SBA_FORMAT )
     {
+#ifndef FIX_137_SID_MD_BITS
         /* TODO: still use old sid frame size to keep bitexactness */
         metadata_sid_bits = (int16_t) ( 5000 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND ) - 1; /* -1 for inactive mode header bit*/
+#else
+        metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND ) - 2 - SID_FORMAT_NBITS; /* -1 for inactive mode header bit*/
+
+#endif
     }
     else
     {
@@ -1275,6 +1280,7 @@ void reset_metadata_spatial(
 #endif
                 hMetaData->ind_list[0].value = 1;
                 metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;
+
                 while ( hMetaData->nb_bits_tot < metadata_sid_bits )
                 {
                     push_next_indice( hMetaData, 0, 1 ); /*fill bit*/