pr-12191-98042f vs. 5.0-20128 / mvk-osx-m1 / chibi-robo-zfighting

pr-12191-98042f (98042f4c) Diff 5.0-20128 (579ccb07)
Failure 14f579d4a185edd2af2d94e3bd4b9b2c800dea20
Failure d2c0984feaddcf21bcd9d9771bdc60b9b8701bbe
Failure 97917f79df0ded0671f3ea1e2de0aaf9fb050999