7.0 clean code

Merged Leandro Martinek requested to merge 7.0-clean_code into 7.0-stage

Merge request reports