Fixed for beta1 release
merge 2.0.0