Merge "[N_SE-33432] non-sqaure matrix is not set correctly" into tizen_2.1