1.0 merge to master branch.