Merge "de::FilePath fixes"