Merge remote-tracking branch 'remotes/origin/main' into 708-aeid-command-line-options-robustness