Merge changes from 1.0.x branch.
Merge changes from 1.0.x repo.
New file from 1.0.x repo