Issue #5192: Fix failing tests on 3.x
Merge branch 'SCHOLAR-3.x' into 5451