Merge to tag public-0.4