Clean-up the validate_attrs method/function
#2042
Merged
validate_attrs method/function
#2042