Syncing fmt_video branch