Merging dev in main with various bug fixes and improvements

Julien Chiquet requested to merge dev into main

that has not been launched.

Merge request reports