Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix setting groups visibility

Change-Id: Ie165f3c9c3d854f9daa7c1147865f29bd3ad7b1f