critical hotfix#1 made
Merge branch 'hotfix/hotfix-1-release-1.0'