Revert "Revert "BFQ 7""

This reverts commit beacf5ecdb9df126caadf85edf608a19fb2daa7b.