am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array"

* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
  Use Object + type in place of specific array