Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev