[~BUGFIX] getFieldMap wasn't able to handle multiple values.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [~BUGFIX] getFieldMap wasn't able to handle multiple values.