pr-13346-0e83f7 vs. 2412-270 / mvk-osx-m1 / sms-water

pr-13346-0e83f7 (0e83f753) Diff 2412-270 (c770e7c2)
Failure 3fc5603d69bde4b6a3d33acbe04f2d3f5e96163d
Failure 2d6de8afcdaf63c6fcb3b1dc57ca9ff0481dfc63
Failure a5d0859a9c4c44450f7cbc3a8ff6559726a5c299