Multiple storages fails with quotes around storage names
Merge branch 'fix_multi-storage'