sync clpb2.0 and master branches
Merge branch 'clpb2.0'