Merge change 24002 into eclair

* changes:
  Fix SparseArray accesses