fixup! update es upstream to fix graceful stop behaviour