Improve Padron Exclusion

Merged Jose Luis Zanotti requested to merge T6718v2 into 17.0

Merge request reports