Merge remote-tracking branch 'origin/main' into ci/extended_complexity_run