Merge branch 'hotfix/link-gitflow'
Merge branch 'master' into dev