Use setImmediate for crawler
Merge branch 'crawler' into develop