Merge branch 'main' into ivas-conformance-windows