Merge remote-tracking branch 'origin/main' into rtp-add-decoder-restart