Merge branch 'bfq'