Typecast user group (proper way)
Merge remote-tracking branch 'upstream/pr/11977' into pr/11977

* upstream/pr/11977:
  Typecast user group (proper way)