Merge "New Optimization Policy"