Merge branch 'nd/gc-aggressive'