WP-2973: adjustments for wrapper fieldset change.