Merge "Fix IDEA warnings in FileBackendStore"