re-expand bundle if caches directory has been cleared
use less expensive check for bundle existence
Merge remote-tracking branch 'origin/develop'