Core: Fix build for shit OS
Closes #12597
Merge remote-tracking branch 'upstream/master'