Backported from master

Send messages to correct queue that belongs to interactive_maps worker
Merge branch 'dev'