Update for beta2
Update for beta2
Merged from master