pr-12972-34db4f vs. 2407-117 / mvk-osx-m1 / chibi-robo-zfighting

pr-12972-34db4f (34db4f94) Diff 2407-117 (8a50676b)
2af4f363e1a89a5ec88fc8f2633506e2b385f806 Waiting for diff... ddded172d668353741b8503f89b0644853396dcc
deed89f53fa1120085c01881f34d77d79455a49d Waiting for diff... 92e7fa721d497114cba626959f2ff03fe36d7393
d173fedf68aa92ac10a054193ee5029b311d16ee Waiting for diff... 1988eaa52653316eb5acfc8bf9efa1cdded14139