Make opt_queue be respected as a maximum value for staged items.
Merge branch 'master' into hfaroll