Update to Upstream branch 0.3.x