[IMP] Improve validation

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

Merge request reports