[nvidia-kmod/f36: 9/9] Merge master