Merge branch 'release/1.9.8' into develop
Fix minor issues
Bump version number
Merge branch 'release/1.9.9'