Adds multi queue support
Version bump
Merge conflict