final details to pingcap
Merge branch 'develop'