Merge "Move file lookup to its own thread for beaming"