Merge branch 'ma/scalar-to-main-fix'