Merge remote-tracking branch 'origin/main' into 2140_fix_object_editing_sanitizer_issues