Update BFQ to v6-r2