Merge 0.4 branch.