Merge branch 'main' into 1378_conformance_script