Merged Changes from FrameScheduler.