Use defaults
Merge branch '2.0'