cherry-pick doc and version changes from 0.4 branch