Merge "Process file_contexts in the same order as specified"