change localhost to 127.0.0.1 for ESL connection
Merge branch 'hotfix/v2.1.5' into develop