Merge "Allow file headers to be refreshed from database"