Merge branch '0.2.0-a2' into 0.2.0-branch