Merge branch 'gboxed-gc'