Merge branch 'nd/gc-auto-background-fix'