Merge "Another workaround for stack overflow issue with clang"