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

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure 4fb7219638199181dfdc27b7c470904b2744f0be
Failure ba0f55ebb01669abfcc7bd247e7fdf0f437691c8
Failure ff397440b338802e740b983895d95af9d87110e6