Since the StorageLoadListener is always loaded above, we don't need the instance variable anymore.
Merge branch 'develop' into arena-caching