Merge branch 'hotfix/hf' into develop
add log
Merge branch 'release/v1.0.2' into alpha