[342235] Updating based on changes in EMF.
13 files changed