WP-3379: update field group wrapper.