Use ES host and port from Settings
Cleaning
Merge branch 'local-branch-1'