Merge from upstream

Merge from upstream to get bottleneck and scatterplot changes.