Upstream changes to v0.0.3