Make sure [options] is an array
Merge remote-tracking branch 'upstream/pr/11876' into pr/11876

* upstream/pr/11876:
  Make sure [options] is an array