Update master with latest 2.0 changes

No review