incorporate @slasher13's patch into an MR

Ben Stallingsrequested to merge
issue/clientside_validation-3575924:3575924- into 4.0.x

Closes #3575924

Merge request reports