pr-9956-6aea0e vs. 5.0-14748 / ogl-lin-mesa / sms-water

pr-9956-6aea0e (6aea0e52) Diff 5.0-14748 (7fe97b27)
Failure 39035e66415fbaaac1c88f9ad754e22fa9008b3b
Failure 890afe3d5dd8f207d3ac398d7a4f5a882f95db20
Failure ffef7f224a802fa1a19f247045bf68b59ac93f1d