Merge branch 'hotfix/fix_publicfolder' into develop
Merge branch 'develop'