Merge "Fix LocalFile::move"