3.8 support update

Assuming there will be no problems with the test we can probably commit this change as proposed by Amiad.