Fixed .. bug with dumpPath cache
Merge branch 'upstream/development'