Merge remote-tracking branch 'origin/main' into 2149_basop_port_mr_2268_fix_object_editing_issues_remainders
