cj1_11_commit
Merge branch 'cj_1_11'