Merge branch 'rs/strbuf-getcwd' into next