[update] update to upstream 1e4dd58

Merge stable 1e4dd58 to master.