WP-3394: update field group wrapper.