Merge branch 'main' into ci/revise-dtx-modes-in-ivas-modes-json