Merge "Fix inconsistency in ArchivedFile::getUser"