Squashed update of BFQ-v6 to BFQ-v6r1, credits arco, original commit 047b7263732c31a245b13859a128691adcb4ed8e