Faces 1638 tester backport 3.0.x legacy