+ Fix exception that occurred with caching when using a virtual folder
Merge branch 'origin/hotfix-1.0.6'
Merge branch 'origin/develop'