Merge branch 'hotfix/branch-handling'
Merge branch 'master' into develop