merge bug25520 into default (again)