Merge branch 'hotfix/01.02.04'
fix current host
Merge branch 'hotfix/01.02.05' into develop