5.0-6988 vs. 5.0-6243 / sw-lin-mesa / et-vid

5.0-6988 (ee955e37) Diff 5.0-6243 (c81ac1a8)
Failure 16949e35bc9cdb443c91e5b05a4a8b06545be1e7
Failure 16697cc082a7d6833173193838b77fc08162c650
Failure 16697cc082a7d6833173193838b77fc08162c650
Failure 04d3238d4c49edbd494e3165161745621197d049