Merge "Silience compiler errors from clang-r563880" into main