[6.0] Validate whether groups should be added to controls #215