Merge branch '672-resolve-nokia-todo-s' into 'main'

Cleanup on Nokia Todos in various places

See merge request !935