Sync coc-qcc branch with master