Merge branch 'rs/cocci' into maint