Merge branch 'release/0.9.7' into develop
fix bug when removing server
0.9.8
Merge branch 'release/0.9.8'