Emulate ring buffer for graceful shutdown
Merge branch 'crawler' into develop