Merged poly-scheduler with master