Merge remote-tracking branch 'origin/main' into 137-sid-todo-qmetadata-masa