pr-13222-a49e22 vs. 2412-31 / ogl-lin-mesa / major-minor

pr-13222-a49e22 (a49e22e1) Diff 2412-31 (ada646a7)
Failure ab7d9030836656257ed512187bbe44e26b0c2b13
Failure 84ada798148240b4dba365840d6db40a3ceac7b4