EA_MODEL Made to match Upstream/master.