Merge branch 'vd/scalar-to-main'