Merge branch 'main' into verification/ism1-nometadata