Fix for debug mode
Merge branch 'master' into cacheManager_v2.2