WP-2998: Update EVA patch.