Merge "Fix logic in validators"