update es/upstream for memory consumption improvement