Merge remote-tracking branch 'remotes/origin/main' into 559-crash-in-planarsba-bitrate-switching