Merge branch 'ds/scalar-updates'