[nvidia-persistenced/el8: 8/8] Merge branch 'f36' into el8