Merge change 5334

* changes:
  Added groups constants and visibility flags.