Merge branch 'net-atlantic-driver-updates'