Merge "Add matrix component types. Fix potental overflow in script -> java messages."