fix cmsbox bug
Merge branch 'fixg2_branch'