pr-9254-894979 vs. 5.0-13016 / sw-lin-mesa / mp7-text

pr-9254-894979 (89497940) Diff 5.0-13016 (4c9b226b)
6742420fe85ee6d846a7b8e471371ce2daf95e81 Failure
61767dda4efb82e225e72bdb2516efc463192e1f Failure