Merge remote branch 'crater/master' into vkernel64