merge fixes #3479 interface.metadata_persistence failing with 'folder in use'