Merge branch 'qcril'