Wip rebase on official nvidia builds