pr-13222-a49e22 vs. 2412-31 / ogl-lin-mesa / nhl-slap

pr-13222-a49e22 (a49e22e1) Diff 2412-31 (ada646a7)
Failure 420b6ce7682355eda7b623e76e7c4e82d04a98f2
Failure 569bc7f54023827cad36b05a06eee61d77806e80