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