Merge "Remove covers validator trait where it is not needed"