Updates to the driver model changes. This should fix a potential panic.
Attach a file by drag & drop or click to upload
