A bit more testing.
refactor
merge bug25561 into stable
merge stable into default