[nvidia-xconfig/el8: 4/4] Merge branch 'master' into el8