Merging Scheduler changes into master for publishing