Merge branch 'cb/buggy-gcc-12-workaround'