Added missing file functions
Merge commit '5179103cc037dd82ce5c41d0a7fad0b9ad93d4b0'