cherry-pick-0ed73181-gcc-10-fix.patch
