Bring in a build fix for GCC12 from our fixes branch.
Attach a file by drag & drop or click to upload
