Merged changes from framescheduler