WP-3380: update field group wrapper.