fix tests
merge bug26000 into default
again
merge default into bug25853
since the previous merge pulled in a breakage