Merge branch 'release/1.9.7' into develop
Rewrites for chapter 10
Update the version number
Merge branch 'release/1.9.8'