Merge master into 2.0

Merge master into 2.0