Merge "Fix routing to EI service"