Hotfix description
Merge branch 'hotfix/hotfix-1' into testing