[nvidia-xconfig/el8] (2 commits) ...Merge branch 'master' into el8