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