Merge branch 'hotfix/issue1'
commit 12:45
Merge branch 'hotfix/issue2' into develop