Merge branch 'DOS0194444' into 'master'

Corrects errors with data using gid_str in place of gid_int

See merge request !165
1 job for master in 14 seconds (queued for 2 minutes and 48 seconds)