Code

Merge branch 'jk/strbuf-vaddf'