Merge branch 'main' into 2186_change_object_editing_gain_limitation