SONAR-5237 - Fixed broken ES isolation (broken in previous commit)