pr-12191-98042f vs. 5.0-20128 / mvk-osx-m1 / sms-water

pr-12191-98042f (98042f4c) Diff 5.0-20128 (579ccb07)
Failure e63c894fbbf6e7235bd9b8c27d0faf443ae51e55
Failure c96c9da1757a0a285b3f7cf8340faf42b92b795d
Failure 331b7f05fb766b4a16d140e400d554a4db511732