Merge "Refactor optimization policies"