Merge change 20021

* changes:
  Support 2D arrays.