Merge branch 'sh/driver-core'