diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100755
new mode 100644
index c13f313a91accefce4c0e64a1838a414beb8ddf0..b7c95bede7c2cbfeee8f2f061b98ef46c24b81c3
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -153,6 +153,8 @@
 #define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */
 #define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */
 
+#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */
+
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
 
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c
index 487f6c704b34a9680129ab0d233cff3ac04184ff..d3f9bb29e2c3fbd1b289087c3c3a1e0c2d9d26cd 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec.c
@@ -1181,6 +1181,9 @@ int16_t ivas_qmetadata_dec_sid_decode(
     float avg_direction_vector[3];
     float direction_vector[3];
     int16_t metadata_sid_bits; /* bits allocated to SID for metadata */
+#ifdef FIX_QMETA_SID_5k2
+    int16_t bits_delta, bits_dir;
+#endif
 #ifdef DEBUG_MODE_QMETADATA
     static FILE *pF = NULL;
     static FILE *pF_azi = NULL;
@@ -1204,8 +1207,12 @@ int16_t ivas_qmetadata_dec_sid_decode(
     }
     else
     {
+#ifdef FIX_QMETA_SID_5k2
+        metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;
+#else
         /* TODO: still use old sid frame size to keep bitexactness */
         metadata_sid_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;
+#endif
     }
 
     start_index = *index;
@@ -1247,16 +1254,80 @@ int16_t ivas_qmetadata_dec_sid_decode(
     {
         q_direction->not_in_2D = 1;
     }
-
-    /* Decode diffuseness*/
-    for ( b = start_band; b < nbands; b++ )
+#ifdef FIX_QMETA_SID_5k2
+    bits_dir = 0;
+    if ( ivas_format != SBA_FORMAT )
     {
-        diffuseness_index[b] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, DIRAC_DIFFUSE_LEVELS - 4 ) + 4;
-        q_direction->band_data[b].energy_ratio_index[0] = diffuseness_index[b];
-        q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[diffuseness_index[b]];
-        q_direction->band_data[b].azimuth_m_alphabet[0] = no_phi_masa[q_direction->band_data[b].bits_sph_idx[0] - 1][0];
+        /* Decode diffuseness*/
+        for ( b = start_band; b < nbands; b++ )
+        {
+            diffuseness_index[b] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, DIRAC_DIFFUSE_LEVELS - 4 ) + 4;
+            q_direction->band_data[b].energy_ratio_index[0] = diffuseness_index[b];
+            q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[diffuseness_index[b]];
+            bits_dir += q_direction->band_data[b].bits_sph_idx[0];
+            q_direction->band_data[b].azimuth_m_alphabet[0] = no_phi_masa[q_direction->band_data[b].bits_sph_idx[0] - 1][0];
+        }
+
+        bits_delta = metadata_sid_bits - ( start_index - *index ) - bits_dir; /* bit_diff is already read */
+
+        if ( bits_delta > 0 )
+        {
+            while ( bits_delta > 0 )
+            {
+                for ( b = start_band; b < nbands && ( bits_delta > 0 ); b++ )
+                {
+                    if ( q_direction->band_data[b].bits_sph_idx[0] < 11 )
+                    {
+                        bits_delta -= 1;
+                        q_direction->band_data[b].bits_sph_idx[0]++;
+                    }
+                }
+            }
+            if ( q_direction->not_in_2D == 0 )
+            {
+                for ( b = start_band; b < nbands; b++ )
+                {
+                    q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 8, q_direction->band_data[b].bits_sph_idx[0] ) );
+                }
+            }
+        }
+        else
+        {
+            while ( bits_delta < 0 )
+            {
+                for ( b = nbands - 1; b >= start_band && ( bits_delta < 0 ); b-- )
+                {
+                    if ( q_direction->band_data[b].bits_sph_idx[0] >= 4 )
+                    {
+                        bits_delta += 1;
+                        q_direction->band_data[b].bits_sph_idx[0]--;
+                    }
+                }
+                if ( q_direction->not_in_2D == 0 )
+                {
+                    for ( b = start_band; b < nbands; b++ )
+                    {
+                        q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 8, q_direction->band_data[b].bits_sph_idx[0] ) );
+                    }
+                }
+            }
+        }
     }
+    else
+    {
+#endif
 
+        /* Decode diffuseness*/
+        for ( b = start_band; b < nbands; b++ )
+        {
+            diffuseness_index[b] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, DIRAC_DIFFUSE_LEVELS - 4 ) + 4;
+            q_direction->band_data[b].energy_ratio_index[0] = diffuseness_index[b];
+            q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[diffuseness_index[b]];
+            q_direction->band_data[b].azimuth_m_alphabet[0] = no_phi_masa[q_direction->band_data[b].bits_sph_idx[0] - 1][0];
+        }
+#ifdef FIX_QMETA_SID_5k2
+    }
+#endif
     for ( b = start_band; b < nbands; b++ )
     {
         q_direction->band_data[b].energy_ratio[0] = 1.0f - diffuseness_reconstructions[diffuseness_index[b]];
@@ -1299,7 +1370,14 @@ int16_t ivas_qmetadata_dec_sid_decode(
     {
         for ( b = start_band; b < nbands; b++ )
         {
-            q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 5, q_direction->band_data[b].bits_sph_idx[0] ) );
+#ifdef FIX_QMETA_SID_5k2
+            if ( ivas_format == SBA_FORMAT )
+            {
+#endif
+                q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 5, q_direction->band_data[b].bits_sph_idx[0] ) );
+#ifdef FIX_QMETA_SID_5k2
+            }
+#endif
             q_direction->band_data[b].azimuth_index[0] = ivas_qmetadata_DecodeQuasiUniform( bitstream, index, q_direction->band_data[b].azimuth_m_alphabet[0] );
             q_direction->band_data[b].azimuth_index[0] = ivas_qmetadata_dereorder_generic( q_direction->band_data[b].azimuth_index[0] ) + ( q_direction->band_data[b].azimuth_m_alphabet[0] >> 1 );
             avg_azimuth = 360.0f / (float) ( q_direction->band_data[b].azimuth_m_alphabet[0] ) * q_direction->band_data[b].azimuth_index[0] - 180;
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c
index bd7cf87bcf2fe8ff200ecf83df98b774f2483fb0..c540c3c263e5e86dbc7f0b7414a6e10ec573b4c6 100644
--- a/lib_enc/ivas_qmetadata_enc.c
+++ b/lib_enc/ivas_qmetadata_enc.c
@@ -833,6 +833,10 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512(
         }
 #endif
 
+#ifdef FIX_QMETA_SID_5k2
+        q_direction->not_in_2D = 0;
+#endif
+
         /*Coherence */
         if ( all_coherence_zero == 0 )
         {
@@ -980,7 +984,11 @@ void ivas_qmetadata_enc_sid_encode(
     else
     {
         /* TODO: still use old sid frame size to keep bitexactness */
+#ifdef FIX_QMETA_SID_5k2
+        metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;
+#else
         metadata_sid_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;
+#endif
     }
 
 #ifdef DEBUG_MODE_QMETADATA
@@ -1036,39 +1044,107 @@ void ivas_qmetadata_enc_sid_encode(
     /*Encode the quantized diffuseness in raw coding*/
     bits_dir = 0;
     bits_diff = 0;
-    for ( b = start_band; b < nbands; b++ )
+#ifdef FIX_QMETA_SID_5k2
+    if ( ivas_format != SBA_FORMAT )
     {
-        q_direction->band_data[b].energy_ratio_index[0] = max( q_direction->band_data[b].energy_ratio_index[0], 4 );
-        bits_diff += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].energy_ratio_index[0] - 4, DIRAC_DIFFUSE_LEVELS - 4 );
+        for ( b = start_band; b < nbands; b++ )
+        {
+            q_direction->band_data[b].energy_ratio_index[0] = max( q_direction->band_data[b].energy_ratio_index[0], 4 );
+            bits_diff += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].energy_ratio_index[0] - 4, DIRAC_DIFFUSE_LEVELS - 4 );
+            q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[q_direction->band_data[b].energy_ratio_index[0]];
 
-        q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[q_direction->band_data[b].energy_ratio_index[0]];
-        if ( q_direction->not_in_2D == 0 )
+            if ( q_direction->not_in_2D == 0 )
+            {
+                q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 8, q_direction->band_data[b].bits_sph_idx[0] ) );
+                bits_dir += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].azimuth_m_alphabet[0] - 1, q_direction->band_data[b].azimuth_m_alphabet[0] );
+            }
+            else
+            {
+                bits_dir += q_direction->band_data[b].bits_sph_idx[0];
+            }
+        }
+
+        /* Reduce bit demand by increasing diffuseness*/
+        bits_delta = metadata_sid_bits - ( hMetaData->nb_bits_tot - bit_pos_start ) - bits_diff - bits_dir;
+        if ( bits_delta > 0 )
         {
-            q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 5, q_direction->band_data[b].bits_sph_idx[0] ) );
-            bits_dir += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].azimuth_m_alphabet[0] - 1, q_direction->band_data[b].azimuth_m_alphabet[0] );
+            while ( bits_delta > 0 )
+            {
+                for ( b = start_band; b < nbands && ( bits_delta > 0 ); b++ )
+                {
+                    if ( q_direction->band_data[b].bits_sph_idx[0] < 11 )
+                    {
+                        bits_delta -= 1;
+                        q_direction->band_data[b].bits_sph_idx[0]++;
+                    }
+                }
+            }
+            if ( q_direction->not_in_2D == 0 )
+            {
+                for ( b = start_band; b < nbands; b++ )
+                {
+                    q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 8, q_direction->band_data[b].bits_sph_idx[0] ) );
+                }
+            }
         }
         else
         {
-            bits_dir += q_direction->band_data[b].bits_sph_idx[0];
+            while ( bits_delta < 0 )
+            {
+                for ( b = nbands - 1; b >= start_band && ( bits_delta < 0 ); b-- )
+                {
+                    if ( q_direction->band_data[b].bits_sph_idx[0] >= 4 )
+                    {
+                        bits_delta += 1;
+                        q_direction->band_data[b].bits_sph_idx[0]--;
+                        if ( q_direction->not_in_2D == 0 )
+                        {
+                            q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 8, q_direction->band_data[b].bits_sph_idx[0] ) );
+                        }
+                    }
+                }
+            }
         }
     }
+    else
+    {
+#endif
+        for ( b = start_band; b < nbands; b++ )
+        {
+            q_direction->band_data[b].energy_ratio_index[0] = max( q_direction->band_data[b].energy_ratio_index[0], 4 );
+            bits_diff += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].energy_ratio_index[0] - 4, DIRAC_DIFFUSE_LEVELS - 4 );
+            q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[q_direction->band_data[b].energy_ratio_index[0]];
+
+            if ( q_direction->not_in_2D == 0 )
+            {
+                q_direction->band_data[b].azimuth_m_alphabet[0] = 1 << ( min( 5, q_direction->band_data[b].bits_sph_idx[0] ) );
+                bits_dir += ivas_qmetadata_encode_quasi_uniform_length( q_direction->band_data[b].azimuth_m_alphabet[0] - 1, q_direction->band_data[b].azimuth_m_alphabet[0] );
+            }
+            else
+            {
+                bits_dir += q_direction->band_data[b].bits_sph_idx[0];
+            }
+        }
 
-    /* Reduce bit demand by increasing diffuseness*/
-    bits_delta = metadata_sid_bits - ( hMetaData->nb_bits_tot - bit_pos_start ) - bits_diff - bits_dir;
+        /* Reduce bit demand by increasing diffuseness*/
+        bits_delta = metadata_sid_bits - ( hMetaData->nb_bits_tot - bit_pos_start ) - bits_diff - bits_dir;
 
-    while ( bits_delta < 0 && ( q_direction->not_in_2D > 0 ) )
-    {
-        for ( b = nbands - 1; b >= start_band && ( bits_delta < 0 ); b-- )
+        while ( bits_delta < 0 && ( q_direction->not_in_2D > 0 ) )
         {
-            if ( q_direction->band_data[b].energy_ratio_index[0] < ( DIRAC_DIFFUSE_LEVELS - 1 ) )
+            for ( b = nbands - 1; b >= start_band && ( bits_delta < 0 ); b-- )
             {
-                bits_delta += q_direction->band_data[b].bits_sph_idx[0];
-                q_direction->band_data[b].energy_ratio_index[0]++;
-                q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[q_direction->band_data[b].energy_ratio_index[0]];
-                bits_delta -= q_direction->band_data[b].bits_sph_idx[0];
+                if ( q_direction->band_data[b].energy_ratio_index[0] < ( DIRAC_DIFFUSE_LEVELS - 1 ) )
+                {
+                    bits_delta += q_direction->band_data[b].bits_sph_idx[0];
+                    q_direction->band_data[b].energy_ratio_index[0]++;
+                    q_direction->band_data[b].bits_sph_idx[0] = bits_direction_masa[q_direction->band_data[b].energy_ratio_index[0]];
+                    bits_delta -= q_direction->band_data[b].bits_sph_idx[0];
+                }
             }
         }
+#ifdef FIX_QMETA_SID_5k2
     }
+#endif
     assert( ( bits_delta >= 0 ) && "Bit budget in Qmetadata SID is violated!!!" );
 
     /*Code diffuseness*/