Turn inline aggregation planner work off. Move some micro-optimization into plan assember part. Check in this point to get tests passed temporarily.