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