Faces 1638 tester backport for 3.0.x