Bug fix with breaking changes, bump version to 0.2.0
Merge pull request #8530 from matt-holden/master

Bug fix with breaking changes, bump version to 0.2.0