Merge remote-tracking branch 'origin/save-to-es' into autostaging