[nvidia-settings-470xx/el8: 4/4] Merge branch 'master' into f35