Syncing with Canary RTC project.