version bump
Merge branch 'release/2.0.0-milestone-11' into develop