Merge branch 'iff_no_queue_fixups'