Merge branch 'matrix-simd' into develop