Merge branch 'hotfix/1.10.7'
fix samsung convert doctor hop finish
Merge branch 'hotfix/1.10.8' into develop