This fixes several compatibility issues when using 9.8.1 as the boot compiler.
Fixes #24605
(cherry picked from commit ef3d20f8)