additional corrections to pingcap
Merge branch 'develop'