Merge "Fix build on clang-r522817" into main