Squashed update of BFQ-v6r1 to BFQ-v6r2