Merge branch 'jk/strbuf-vaddf' into next