Backport GPU improvements from N7100