Merge branch 'gfio' into gfio-int