Fixes #6553: example fix for validation states
Fixes #6552: example fix for button group