Update BFQ-v3r4 to v5