Merge branch 'main' into ci/fix-ivas-conf-2