Issue 563: Support non-rectangular Data Matrix