fix possible stack overflow
Merge branch 'fix_build' into development