Merge branch 'hotfix/v0.2.15.1'
fixed Test
Merge branch 'hotfix/v0.2.15.2' into develop