Merge remote-tracking branch 'origin/main' into 672-resolve-nokia-todo-s