7 hotfix
Merge branch 'hotfix/7'