Merge branch 'xiang/optChkp' of charmgit:charm into charm