Merge branch 'ss/fix-config-fd-leak' into maint