Resolve conflicts in scheduler merge

Changes to bring scheduler branch to latest develop changes.