These patches implement the changes for a major speedup, as described in #871835. They only change the file functions