fix tests
merge bug26000 into default
again