Merge "Debug: Use UniqueFile"