Merge remote-tracking branch 'remotes/origin/main' into 1309-object-editing-crash-when-debugging-is-activated