Merge branch 'mv/defer-gc'