Merge remote-tracking branch 'remotes/origin/main' into combined_format_signaling