Migrated more functionality into StorageFormatManager.
Merged master.