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

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