Merge branch 'hotfix/1.0.5'
Merge branch 'develop'
quick copy changes
Merge branch 'hotfix/1.0.6' into develop