Merge branch 'hotfix/hotfix_1'
Merge branch 'release/release_1'
Merge branch 'develop'
Merge branch 'master' into develop