Fixed in master and 5.0 branches.

I'm leaving this open to cover other test failures (if found).