EVA update.
Merge pull request #3699 from Segrain/dev-freeze

Dev-freeze map.