BP-796 fix wrong restriction on groupId
17 files changed