Schedulers merge

Merging to schedulers branch