Merge branch 'nd/daemonize-gc' into maint