Merge "SF: Dedupe functions to apply Scheduler::Policy"