Merge branch 'SCHOLAR-3.10' into SCHOLAR-3.x
Merge branch 'SCHOLAR-3.10' into SCHOLAR-3.x
Fix #4555 by adding the missing validate() function.