diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index 832eead900ed065fec7be2a268f3df4befe292a3..8e2b32d4d054cf00bc9d30a4eaa9de36a4618e37 100644
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -5811,6 +5811,15 @@ void ivas_omasa_render_objects_from_mix(
     const int16_t output_frame                                  /* i  : output frame length per channel        */
 );
 
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+void ivas_omasa_gain_masa_tc(
+    float *output[],                                            /* i/o  : output synthesis signal                 */
+    const float gainMasa,                                       /* i  : gain for MASA transport channels        */
+    const int16_t nchan_transport_ism,                          /* i  : number of ISM TCs                       */
+    const int16_t output_frame                                  /* i  : output frame length per channel         */
+);
+#endif
+
 void ivas_omasa_dirac_rend_jbm(
     Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
     const uint16_t nSamplesAsked,                               /* i  : number of samples requested             */
diff --git a/lib_com/options.h b/lib_com/options.h
index c0b8c7f094af2c4077c9dbf8248792aac7405ceb..70ad3bf4afa998c8bc5913927dadb4046be015fa 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -204,6 +204,8 @@
 #define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */
 #define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */
 #define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */
+#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */
+#define NONBE_FIX_1172_OBJ_EDIT_JBM                     /* VA: issue 1172: fix OMASA object editing in JBM */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 152560aadf4fd2311d9d8fb595fb6d7642489969..a168da91ecc10744dc05935edb136fd05d5a2809 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -3079,6 +3079,13 @@ void ivas_dec_prepare_renderer(
         {
             ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
         }
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+        /* MASA transport gaining for edited disc OMASA EXT. For ISMs, only metadata is modified */
+        if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )
+        {
+            ivas_omasa_gain_masa_tc( st_ivas->hTcBuffer->tc, st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->nchan_ism, st_ivas->hTcBuffer->n_samples_available );
+        }
+#endif
     }
     else if ( st_ivas->ivas_format == STEREO_FORMAT )
     {
@@ -3154,6 +3161,16 @@ void ivas_dec_prepare_renderer(
             {
                 ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
             }
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+            /* MASA transport gaining for edited param_one OMASA EXT. For ISMs, only metadata is modified.  */
+            if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )
+            {
+                for ( n = 0; n < CPE_CHANNELS; n++ )
+                {
+                    v_multc( st_ivas->hTcBuffer->tc[n], st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->hTcBuffer->tc[n], st_ivas->hTcBuffer->n_samples_available );
+                }
+            }
+#endif
         }
         else
         {
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c
index 935a3ab365cfb0719e914a990a7c648ad3f5083a..73b6ecd8c47d1d64605c07a87e5c9eaf802678dc 100644
--- a/lib_dec/ivas_objectRenderer_internal.c
+++ b/lib_dec/ivas_objectRenderer_internal.c
@@ -184,7 +184,11 @@ ivas_error ivas_td_binaural_renderer_sf(
         }
         if ( subframe_idx == ism_md_subframe_update_jbm )
         {
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )
+#else
             if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )
+#endif
             {
                 ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];
                 ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];
@@ -196,7 +200,19 @@ ivas_error ivas_td_binaural_renderer_sf(
                     ismMetaData[nS].yaw = st_ivas->hIsmMetaData[nS]->edited_yaw;
                     ismMetaData[nS].pitch = st_ivas->hIsmMetaData[nS]->edited_pitch;
                     ismMetaData[nS].non_diegetic_flag = st_ivas->hIsmMetaData[nS]->non_diegetic_flag;
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+                    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
+                    {
+                        /* DISC OMASA ISM gaining with TDREND is done in ivas_dec_prepare_renderer()*/
+                        ismMetaData[nS].gain = 1;
+                    }
+                    else
+                    {
+                        ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;
+                    }
+#else
                     ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;
+#endif
                     hIsmMetaData[nS] = &ismMetaData[nS];
                 }
 
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 44d4b70ca0e45b3a5d23f2b8f11aa1cf86c9bd64..43f102d123863f9289a4f15394f2118e3acdefef 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -1317,3 +1317,28 @@ void ivas_omasa_render_objects_from_mix(
 
     return;
 }
+
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+/*--------------------------------------------------------------------------*
+ * ivas_omasa_gain_masa_tc()
+ *
+ * in case of external rendering with object editing, MASA transport channels
+ * need to be gained
+ *--------------------------------------------------------------------------*/
+
+void ivas_omasa_gain_masa_tc(
+    float *output[],                   /* i/o  : output synthesis signal         */
+    const float gainMasa,              /* i  : gain                            */
+    const int16_t nchan_transport_ism, /* i  : number of ISM TCs               */
+    const int16_t output_frame         /* i  : output frame length per channel */
+)
+{
+    /* Edited OMASA EXT MASA transport gaining */
+    for ( int16_t ch = 0; ch < 2; ch++ )
+    {
+        v_multc( output[nchan_transport_ism + ch], gainMasa, output[nchan_transport_ism + ch], output_frame );
+    }
+
+    return;
+}
+#endif
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 17ed304c574a83f8585a222707ef90878a271496..c6db4c74bfaec992fb8483bc3daf679d73719abb 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -1657,12 +1657,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 st_ivas->hIsmMetaData[obj]->edited_azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;
                 st_ivas->hIsmMetaData[obj]->edited_elevation = hIvasEditableParameters.ism_metadata[obj].elevation;
                 st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;
-
-                st_ivas->hIsmMetaData[obj]->edited_gain = hIvasEditableParameters.ism_metadata[obj].gain;
-
                 st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
                 st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
-
+                st_ivas->hIsmMetaData[obj]->edited_gain = hIvasEditableParameters.ism_metadata[obj].gain;
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
             }
 
@@ -1806,7 +1803,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 }
                 else
                 {
-                    /* detect editing in ISM_MASA_MODE_DISC. optionally, add quantization-resolution -based thresholds */
+                    /* detect editing in ISM_MASA_MODE_DISC mode */
                     if ( fabsf( st_ivas->hIsmMetaData[obj]->azimuth - hIvasEditableParameters.ism_metadata[obj].azimuth ) > OMASA_AZI_EDIT_THR ||
                          fabsf( st_ivas->hIsmMetaData[obj]->elevation - hIvasEditableParameters.ism_metadata[obj].elevation ) > OMASA_ELE_EDIT_THR )
                     {
@@ -1836,11 +1833,20 @@ ivas_error IVAS_DEC_SetEditableParameters(
             /* Copy edited values to hIsmMetaData struct */
             if ( st_ivas->hIsmMetaData[obj] != NULL )
             {
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+                st_ivas->hIsmMetaData[obj]->edited_azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;
+                st_ivas->hIsmMetaData[obj]->edited_elevation = hIvasEditableParameters.ism_metadata[obj].elevation;
+                st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
+                st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
+                st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;
+#endif
+#ifndef NONBE_FIX_1172_OBJ_EDIT_JBM
                 st_ivas->hIsmMetaData[obj]->azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;
                 st_ivas->hIsmMetaData[obj]->elevation = hIvasEditableParameters.ism_metadata[obj].elevation;
                 st_ivas->hIsmMetaData[obj]->yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
                 st_ivas->hIsmMetaData[obj]->pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
                 st_ivas->hIsmMetaData[obj]->radius = hIvasEditableParameters.ism_metadata[obj].radius;
+#endif
                 st_ivas->hIsmMetaData[obj]->edited_gain = hIvasEditableParameters.ism_metadata[obj].gain;
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
             }
@@ -2825,7 +2831,11 @@ ivas_error IVAS_DEC_GetObjectMetadata(
             metadata->gainFactor = 1.f;
             metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
         }
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+#else
         else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+#endif
         {
             metadata->azimuth = st_ivas->hIsmMetaData[objectIdx]->edited_azimuth;
             metadata->elevation = st_ivas->hIsmMetaData[objectIdx]->edited_elevation;