OP-1212 better wait on priority queue than std queue