Merge "Fix naming mistake in multiply_mat" into nextgenv2