WP-2541: make fields changes for working paper eva.