am c24234e9: Merge "Another workaround for stack overflow issue with clang"

* commit 'c24234e9d6fea3d6d5451aa4fa14ca0c6e63f8bd':
  Another workaround for stack overflow issue with clang