Merged Changes from FrameScheduler