Merge branch 'sb/cocci-pending'