Merge branch 'gc/doc-cocci-updates'