Make EVA-field reflect refactoring in:
ec19ba3e98640e5f586abb17ac0976e770b85c13