Overhauling StorageManager interface
More bug fixes related to new StorageManager interface
Final bug fixes for 3.1.2.RC2