Merge "Workaround stack overflow issue with clang"