Merge remote-tracking branch 'remotes/origin/main' into float-1566-ext-output-in-format-switching