Merge branch 'hotfix/issue05'
Merge branch 'release/issue06-07'
hotfix/issue08
Merge branch 'hotfix/issue08' into develop