correct and/or confusion
merge bug25378 into stable
merge stable into default