Merge with upstream's v0.3.4