Merge Master's OnVmAdd into Init.