Merge branch 'hotfix/1.1.1'
Fix folder checking issue
Merge branch 'hotfix/1.1.2' into develop