Merge remote-tracking branch 'ms/kernel-update' into next