Merge branch 't/gcc-compat_fix'