Merge "Fix StorageController bugs."