Remove Spaces and Change Filter

Merged Jose Luis Zanotti requested to merge 7.0-stage into 7.0

Remove Spaces and Change Filter

Merge request reports