Updating to version 2.8.9.
Merge branch 'release/v2.8.9' into develop