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