Merge branch 't/old_gcc_fixes'