Merge pull request #551 from mayeut/coc-qcc