Task #2170397 by ezra-g: Add patch to Advanced queue to cleanup advancedqueue table