Merge "Revert "Revert "Revert "Workaround build breakage from full LTO ..."" into main