Merge remote-tracking branch 'origin/main' into nokia/object-editing-interface