Merge "Add missing Optimization base policy type"