Graphics: FPS and timers
merging main