Merge branch 'rs/strbuf-cocci-workaround'