BFQ v2 to BFQ v2-r1