Merge branch 'main' into ci/basop-and-enc-dec-for-ivasbuildandrunchecks