Temporary fix issue #3167 in non-multithread mode #1
Temporary fix issue #3167 in non-multithread mode #2
Merge pull request #3171 from raven02/patch-1

Temporary fix issue #3167 in non-multithread mode