Merge "scott's custom vcore image"