Merge branch 'hotfix/0.9.8.5' into develop
Update 0.9.8.5
Merge branch 'release/0.9.8.5.1'