Fix duplicate column definition.
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Fix duplicate column definition.