Rebase back to BFQVR