Merge diffs from nvidia branch