Merge refactor into master

Alberto Pascual requested to merge refactor into master

Merge request reports