Cleanup/Checkup for release 3.2

Merged Farid Mohammadi requested to merge fix/cleanup into master
Edited by Gabi Seitz

Merge request reports