Merge scheduler to master