cj_1_12_20:35commit
Merge branch 'cj_1_12_15-26_Branch'