Merge branch 'hotfix-4.4.4'
Performance improvement. Removed the storage queue and using an in-memory list. Also using a round robin approach.