Hotfix for logging
Hotfix for ES
Hotfix for ES
Hotfix for ES
Merge branch 'master' into develop