some fix
Merge branch 'hotfix-2.0.7' into develop