Merge "Fix translationZ matrix computation"