Merge branch 'rs/strbuf-detach'