Issue #3258312 by Alexander Allen, noemi: Merge remote fork 'spark/master' for evaluation in feature branch.