fixes #3697, #3701 - more comprehensive field validations
(cherry picked from commit 4bae5cedb8ab562b6c397234c5cb1cfd604fde74)
fixes #3697, #3701 - more comprehensive field validations
(cherry picked from commit 4bae5cedb8ab562b6c397234c5cb1cfd604fde74)