Fixing issue with symlinked vaults
Merge pull request #8923 from nfelger/devel

Fixing issue with symlinked vaults