pr-8793-467163 vs. 5.0-12294 / sw-lin-mesa / ss-map

pr-8793-467163 (46716337) Diff 5.0-12294 (695a9649)
Failure 96d361657b11f2783b11dec89aa7b38d7da9df63
Failure f7a96d3646616d620c9922defb6786cfb42615e6
Failure f7a96d3646616d620c9922defb6786cfb42615e6
Failure 6340993c6ee1b580c05e51bfc466713c0620b4d9