Merge "Changed error message when a storage is full"