[nvidia-persistenced/el9: 2/2] Merge branch 'master' into el9