Imported Upstream version 2.0.0-beta2
Merge tag 'upstream/2.0.0-beta2'

Upstream version 2.0.0-beta2
changed gid back to integer