bug fix ccc
Merge branch 'qa/bugfix3' into stage