Added a little time to flush the queue
Merge branch 'develop'

* develop:
  Added a little time to flush the queue