Merge branch 'main' into add-debugging-info-to-26-252-be-conformance-scripts