pr-9254-894979 vs. 5.0-13016 / sw-lin-mesa / nhl-slap

pr-9254-894979 (89497940) Diff 5.0-13016 (4c9b226b)
b89e480e5ffe9af9e37e780ecfc6fe52bf44af4a Failure
ff91ac8cc3b48b60edcb7d3a6d3baa003c9311f4 Failure