Merge "Fix generic inferred type argument."
tree: 8cd3a9d4b7781730bccb2547f3788a0edc734e4d
  1. core/
  2. services/
  3. tests/