Merge remote-tracking branch 'rtc/rtc-next'