Merge clean into developement

Jorin Diemerrequested to merge
clean into developement

Update development branch based on cleaning

Merge request reports