More restrictive Queue API
Merge remote-tracking branch 'origin'