case 3018 - Force to always return an array in creator getter.
Merge branch 'case-3018' into new-search

* case-3018:
  case 3018 - Force to always return an array in creator getter.