5.0-6226 vs. 5.0-6224 / sw-lin-mesa / mp7-text

5.0-6226 (c6615614) Diff 5.0-6224 (c3dc8bf1)
Failure 68820d48cf5fe87bd89efdc051d2b63e89c6de71
Failure ba269663c43ef6245f2134f2eccdf5c79b6de40b
Failure ba269663c43ef6245f2134f2eccdf5c79b6de40b