labelGroups+legalValues added
Merge branch 'master' into plus-one-fix
Merge branch 'plus-one-fix'