Merge branch 'release/97' into develop
Bumped version for development after release.
Bumped version for release of 98
Merge branch 'release/98'