Merge branch '2182-move-scaling-operations-outside-matrix-mul-operations' into 2185-optimize-matrix-mul-output-format-fix
