Add "field_group"

Signed-off-by: Thomas Wagner <twagner@ivlab.com>
cleanup commit