Merge branch '451-revision-of-todo-comments-icbwe' into 'main'

Resolve "Revision of ToDo comments related to ICA and ICBWE"

See merge request !901