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