Merge "Fixing Storage Volume(s) Retrieval."