Merge "Refactored Emf to EMF in web feature and docs"