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