Merge branch 'mv/clone-strbuf'