hotfix finished
Merge branch 'hotfix-iss01'