Merge branch master into v2.0