Initial commit from upstream branch 2.0.0