Merge branch 'main' into 1431_change_object_editing_gain_limitation