#18937 done. Fixed validations