ES errors reported as service unavailable
Merge remote-tracking branch 'upstream/master'