Merge "Get filename from File faster" into lmp-dev