Rollback some GC changes
Merge branch 'check' into dev