Merge branch 'br/gccfix'