Merge branch 'hotfix/hotfix2' into develop
author name test
Merge branch 'develop'