cfq talk
Merge branch 'hotfix/cfq'