[nvidia-persistenced/f39: 5/5] Merge branch 'f40' into f39