3.0 => 3.5
merge bug26130 into default (again)