Merge "Workaround Clang hangs indefinitely" into main