Merge branch 'rs/cleanup-strbuf-users'