Merge branch 'sl/clean-d-ignored-fix' into maint