HHH-8010 Updated to support app-managed EMF