pr-13222-08f6f1 vs. 2412-31 / ogl-lin-mesa / smg-mmg

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 866c31acb6266d20b2935eb5d6e8fe05d109c4c5
Failure af639ad9fd54bdec0b16885bd8674f3f03f45104
Failure 34a585656869b6b811a5a5d9744b1bb33f0c7d9f