diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index 109ca13729fa88ad45beac894645747d6d4faff5..08e5694d6f214e06f023c4b03dee2d50c7ac4e56 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -178,6 +178,15 @@ void ivas_omasa_render_objects_from_mix_fx(
     Word16 *output_q                                            /* i/o: output Q value                          */
 );
 
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+void ivas_omasa_gain_masa_tc_fx(
+    Word32 *output_fx[],                                       /* i/o: output synthesis signal                  */
+    const Word16 gainMasa_fx,                                  /* i  : gain for MASA transport channels         */
+    const Word16 nchan_transport_ism,                          /* i  : number of ISM TCs                        */
+    const Word16 output_frame                                  /* i  : output frame length per channel          */
+);
+#endif
+
 ivas_error ivas_omasa_ism_metadata_dec_fx(
     Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */
     const Word32 ism_total_brate,                               /* i  : ISM total bitrate                       */
diff --git a/lib_com/options.h b/lib_com/options.h
index 53c55e725edc187254d0a66a4aadc9c0d8719678..0e364d2b85bdae7ae2009acb46341414ebc62ef9 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -129,6 +129,8 @@
 #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 FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */
+#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_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index 3e171a8de98ab0cee14c1eec5975b18fc3032909..62a5b5490f0d0f76e9171f1ce6ded4fffc877a52 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -4424,6 +4424,16 @@ void ivas_dec_prepare_renderer_fx(
         {
             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 */
+        test();
+        test();
+        test();
+        IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_16( st_ivas->hMasaIsmData->masa_gain_is_edited, 1 ) )
+        {
+            ivas_omasa_gain_masa_tc_fx( st_ivas->hTcBuffer->tc_fx, st_ivas->hMasaIsmData->gain_masa_edited_fx, st_ivas->nchan_ism, st_ivas->hTcBuffer->n_samples_available );
+        }
+#endif
     }
     ELSE IF( EQ_16( st_ivas->ivas_format, STEREO_FORMAT ) )
     {
@@ -4547,6 +4557,18 @@ void ivas_dec_prepare_renderer_fx(
             {
                 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.  */
+            test();
+            IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && EQ_16( st_ivas->hMasaIsmData->masa_gain_is_edited, 1 ) )
+            {
+                FOR( n = 0; n < CPE_CHANNELS; n++ )
+                {
+                    v_multc_fx_16( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hMasaIsmData->gain_masa_edited_fx, st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available ); // Q8
+                    Scale_sig32( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, Q3 );                                                                         // Q8 -> Q11
+                }
+            }
+#endif
         }
         ELSE
         {
diff --git a/lib_dec/ivas_objectRenderer_internal_fx.c b/lib_dec/ivas_objectRenderer_internal_fx.c
index 98a57c4cd360c69ba106abf465e2a244ed1d017e..0e30c932376a1d4684119cc2da24bf20393131fd 100644
--- a/lib_dec/ivas_objectRenderer_internal_fx.c
+++ b/lib_dec/ivas_objectRenderer_internal_fx.c
@@ -214,7 +214,12 @@ ivas_error ivas_td_binaural_renderer_sf_fx(
         IF( EQ_16( subframe_idx, ism_md_subframe_update_jbm ) )
         {
             test();
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+            test();
+            IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
+#else
             IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) || EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+#endif
             {
                 ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];
                 ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];
@@ -232,8 +237,22 @@ ivas_error ivas_td_binaural_renderer_sf_fx(
                     move32();
                     ismMetaData[nS].non_diegetic_flag = st_ivas->hIsmMetaData[nS]->non_diegetic_flag;
                     move16();
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+                    IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
+                    {
+                        /* DISC OMASA ISM gaining with TDREND is done in ivas_dec_prepare_renderer()*/
+                        ismMetaData[nS].gain_fx = ONE_IN_Q29;
+                        move32();
+                    }
+                    ELSE
+                    {
+                        ismMetaData[nS].gain_fx = st_ivas->hIsmMetaData[nS]->edited_gain_fx;
+                        move32();
+                    }
+#else
                     ismMetaData[nS].gain_fx = st_ivas->hIsmMetaData[nS]->edited_gain_fx;
                     move32();
+#endif
                     hIsmMetaData[nS] = &ismMetaData[nS];
                 }
 
diff --git a/lib_dec/ivas_omasa_dec_fx.c b/lib_dec/ivas_omasa_dec_fx.c
index 75e5a0afcd6a43c996ef5d0ff7292079f1ff95c2..4749fc22dd4c9d3823f9c5f5e4e488508bdba138 100644
--- a/lib_dec/ivas_omasa_dec_fx.c
+++ b/lib_dec/ivas_omasa_dec_fx.c
@@ -2158,3 +2158,29 @@ void ivas_omasa_render_objects_from_mix_fx(
 
     return;
 }
+
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+/*--------------------------------------------------------------------------*
+ * ivas_omasa_gain_masa_tc_fx()
+ *
+ * in case of external rendering with object editing, MASA transport channels
+ * need to be gained
+ *--------------------------------------------------------------------------*/
+
+void ivas_omasa_gain_masa_tc_fx(
+    Word32 *output_fx[],              /* i/o: output synthesis signal, Q11    */
+    const Word16 gainMasa_fx,         /* i  : gain, Q12                       */
+    const Word16 nchan_transport_ism, /* i  : number of ISM TCs               */
+    const Word16 output_frame         /* i  : output frame length per channel */
+)
+{
+    /* Edited OMASA EXT MASA transport gaining */
+    FOR( Word16 ch = 0; ch < 2; ch++ )
+    {
+        v_multc_fx_16( output_fx[nchan_transport_ism + ch], gainMasa_fx, output_fx[nchan_transport_ism + ch], output_frame ); // Q8
+        Scale_sig32( output_fx[nchan_transport_ism + ch], output_frame, Q3 );                                                 // Q8 -> Q11
+    }
+
+    return;
+}
+#endif
diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c
index 7ee9289a62f05b8f0f792739f3cfe45bc9b7c93e..be60b0580f90f33542aaf146bda4b9b1a261f01b 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -2318,7 +2318,11 @@ ivas_error IVAS_DEC_GetObjectMetadata(
             metadata->gainFactor_fx = ONE_IN_Q29;
             metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
         }
+#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT
+        ELSE IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
+#else
         ELSE IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
+#endif
         {
             metadata->azimuth_fx = st_ivas->hIsmMetaData[objectIdx]->edited_azimuth_fx;
             metadata->elevation_fx = st_ivas->hIsmMetaData[objectIdx]->edited_elevation_fx;
@@ -4387,12 +4391,12 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 move32();
                 st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
                 move32();
-                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
-                move32();
                 st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
                 move32();
                 st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
                 move32();
+                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
+                move32();
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
                 move16();
             }
@@ -4543,7 +4547,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 */
                     test();
                     IF( L_abs( L_sub( st_ivas->hIsmMetaData[obj]->azimuth_fx, hIvasEditableParameters.ism_metadata[obj].azimuth_fx ) ) > OMASA_AZI_EDIT_THR_FX ||
                         L_abs( L_sub( st_ivas->hIsmMetaData[obj]->elevation_fx, hIvasEditableParameters.ism_metadata[obj].elevation_fx ) ) > OMASA_ELE_EDIT_THR_FX )
@@ -4579,6 +4583,19 @@ 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_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
+                move32();
+                st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
+                move32();
+#endif
+#ifndef NONBE_FIX_1172_OBJ_EDIT_JBM
                 st_ivas->hIsmMetaData[obj]->azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
                 move32();
                 st_ivas->hIsmMetaData[obj]->elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
@@ -4589,6 +4606,7 @@ ivas_error IVAS_DEC_SetEditableParameters(
                 move32();
                 st_ivas->hIsmMetaData[obj]->radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
                 move32();
+#endif
                 st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx; // TODO: check incoming Q value
                 move32();
                 st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;