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