Merge branch 'hotfix/new-bug1'
fix bug2
Merge branch 'hotfix/new-bug2' into develop