Version 0.98.0
Merge branch 'release_0.98.0' into release
Merge branch 'release' into dev