694: merge core agg with LayoutFarm
964.1