Noetic changes into master

Merged Matthias Mayr requested to merge noetic into master

Merge request reports