[ test suite ] Changes due to changes in the standard library
Merge branch 'maint-2.4.2'
[ test suite (master) ] Changes due to changes in the standard library