Merge branch 'master' into expose_preaggregated_cfs
Merge branch 'expose_preaggregated_cfs' into tmp/moving_forward