Merge branch 'qlcnic'