use less [] on shared_map
Merge remote-tracking branch 'upstream/master' into next