Merge branch 'rs/cocci'