Queue handling routines redefined after review
Authored by: aweiss 2013-05-14
Parent: [r807]
Child: [r809]