Merge branch 'jk/no-system-includes-in-dot-c' into maint